diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2011-12-07 17:33:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-07 17:33:09 +0100 |
| commit | ffe7e4063987678c00589717d7871f837c6e7300 (patch) | |
| tree | 1aeee46780d9f7601909a4baa5f0c766c555e2e2 /include/linux/timerqueue.h | |
| parent | Merge branch 'fix/hda' into topic/hda (diff) | |
| parent | ALSA: hda/realtek - Fix lost speaker volume controls (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions