tree 2571a28b8e1d1637273be8a7988d6ab72460af39
parent e82bb314eab2e25a7657f34450665160a5a6cc2b
parent 7693457547b729d9010a6014bbb8572b085f58d4
author Linus Torvalds <torvalds@linux-foundation.org> 1293149072 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1293149072 -0800

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:
  ALSA: hda - Fix GPIO2-fixup for Sony laptops
  ALSA: hda - Try to find an empty control index when it's occupied
  ALSA: hda - Fix conflict of d-mic capture volume controls
  ALSA: hda - Don't apply ALC269-specific initialization to ALC275
  ALSA: hda - Add fix-up for Sony VAIO with ALC275 codecs
  ALSA: pcm: remember to always call va_end() on stuff that we va_start()
  ALSA: HDA: Add auto-mute for Thinkpad SL410/SL510