tree 0a523c3e84e7180547f54df615ca20e4e5293045
parent 05ad62a5ee2ec2f65142aa2bf5c8a7e2f9cf9590
parent 85255c0e078158ede61ff8bd296e306db6f7ed19
author Linus Torvalds <torvalds@linux-foundation.org> 1269879134 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269879134 -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:
  ALSA: hda: Use LPIB for ga-ma770-ud3 board
  ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist
  ALSA: pcm_lib - fix xrun functionality
  ALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklist
  ALSA: hda - Don't set invalid connection index in Realtek initialiaiton