diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 13:28:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 13:28:27 -0400 |
commit | 2f3e12bd9c52bbda42adc8c41612b1e9ab7acb1e (patch) | |
tree | a988190285cd1caa77c4dbe038bde542d761f00d /drivers/hid/hid-debug.c | |
parent | 345ef87b3741351a1b068a8b4828eb9d188b03f1 (diff) | |
parent | 8dc9abb93dde94e7f2bc719032fe16f5713df05c (diff) |
Merge tag 'sound-3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Just a copule of HD-audio device/codec-specific quirks, and a trivial
replacement of udelay() with mdelay() in the old es18xx driver code.
All should be safe to apply"
* tag 'sound-3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda/realtek - Add headset Mic support for Dell machine
ALSA: hda - add headset mic detect quirk for a Dell laptop
ALSA: es18xx driver should use udelay error
ALSA: hda/realtek - Add support of ALC288 codec
Diffstat (limited to 'drivers/hid/hid-debug.c')
0 files changed, 0 insertions, 0 deletions