Merge branch 'topic/msnd' into for-linus

author Takashi Iwai <tiwai@suse.de>

Mon, 23 Mar 2009 23:36:15 +0000 (00:36 +0100)

committer Takashi Iwai <tiwai@suse.de>

Mon, 23 Mar 2009 23:36:15 +0000 (00:36 +0100)
author Takashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:15 +0000 (00:36 +0100)
committer Takashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:15 +0000 (00:36 +0100)
diff --cc Documentation/sound/alsa/ALSA-Configuration.txt
Simple merge
diff --cc sound/isa/Kconfig
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Mon, 23 Mar 2009 23:36:15 +0000 (00:36 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Mon, 23 Mar 2009 23:36:15 +0000 (00:36 +0100)
		1	2
Documentation/sound/alsa/ALSA-Configuration.txt	patch \|	diff1 \|	diff2 \|	blob \| history
sound/isa/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history