tree ccedb10f7d966361e569a3249a1db7209d6faba5
parent 61d718076e95eb461fd4c3692b702a82e2be0df4
parent e04dd2d21bb70dd707d569d4ac843149b9acfb27
author Linus Torvalds <torvalds@linux-foundation.org> 1268956099 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1268956099 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  sound: sequencer: clean up remove bogus check
  ALSA: hda: Use LPIB and 6stack-dig for eMachines T5212
  ALSA: hda - Disable MSI for Nvidia controller
  ALSA: hda - Add PCI quirks for MSI NetOn AP1900 and Wind Top AE2220
  ALSA: hda - Fix secondary ADC of ALC260 basic model
  ALSA: hda - Add an error message for invalid mapping NID
  ALSA: hda - New Intel HDA controller