Merge branch 'topic/lola' into for-linus

author Takashi Iwai <[email protected]>

Sun, 22 May 2011 08:01:22 +0000 (10:01 +0200)

committer Takashi Iwai <[email protected]>

Sun, 22 May 2011 08:01:22 +0000 (10:01 +0200)
author Takashi Iwai <[email protected]>
Sun, 22 May 2011 08:01:22 +0000 (10:01 +0200)
committer Takashi Iwai <[email protected]>
Sun, 22 May 2011 08:01:22 +0000 (10:01 +0200)
diff --cc Documentation/sound/alsa/ALSA-Configuration.txt
Simple merge
diff --cc sound/pci/Kconfig
Simple merge
author	Takashi Iwai <[email protected]>
	Sun, 22 May 2011 08:01:22 +0000 (10:01 +0200)
committer	Takashi Iwai <[email protected]>
	Sun, 22 May 2011 08:01:22 +0000 (10:01 +0200)
		1	2
Documentation/sound/alsa/ALSA-Configuration.txt	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history