diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2012-03-02 09:00:33 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-02 09:00:33 +0100 |
| commit | 7c589750a70831b8cee3c10e01c297fefde104e3 (patch) | |
| tree | 871da898d9953dd50c4830400ba1dd0b614ee311 /include/linux/timerqueue.h | |
| parent | ALSA: hda/conexant - Clear unsol events on unused pins (diff) | |
| parent | ALSA: hda - Kill hyphenated names (diff) | |
Merge branch 'fix/hda' into topic/hda
Speaker-Out renames are merged.
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions