diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2012-04-19 17:17:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-19 17:20:13 +0200 |
| commit | d39801105722c9aef9eae180656190c399c576a9 (patch) | |
| tree | c999d56c418920a9fda656259afb3f13dfd7616e /include/linux/timerqueue.h | |
| parent | ALSA: hda - Fix oops caused by recent commit "Fix internal mic for Lenovo Ideapad U300s" (diff) | |
| parent | Merge branch 'fix/cxt-stable' into fix/hda (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_conexant.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions