]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 May 2010 16:48:27 +0000 (09:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 May 2010 16:48:27 +0000 (09:48 -0700)
* 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: Revert "ALSA: hda/realtek: quirk for D945GCLF2 mainboard"
  ALSA: hda - add support for Lenovo ThinkPad X100e in conexant codec
  ALSA: hda - fix DG45ID SPDIF output


Trivial merge