From: Linus Torvalds Date: Mon, 29 Mar 2010 16:12:14 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=376a21ff42ba71167afe7a47aeb1ca19470cf580;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git Merge branch 'for-linus' of git://git./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 --- 376a21ff42ba71167afe7a47aeb1ca19470cf580