Merge branch 'topic/oxygen' into to-push

author Takashi Iwai <[email protected]>

Thu, 25 Dec 2008 10:40:30 +0000 (11:40 +0100)

committer Takashi Iwai <[email protected]>

Thu, 25 Dec 2008 10:40:30 +0000 (11:40 +0100)
author Takashi Iwai <[email protected]>
Thu, 25 Dec 2008 10:40:30 +0000 (11:40 +0100)
committer Takashi Iwai <[email protected]>
Thu, 25 Dec 2008 10:40:30 +0000 (11:40 +0100)
diff --cc Documentation/sound/alsa/ALSA-Configuration.txt
Simple merge
diff --cc sound/pci/Kconfig
Simple merge
author	Takashi Iwai <[email protected]>
	Thu, 25 Dec 2008 10:40:30 +0000 (11:40 +0100)
committer	Takashi Iwai <[email protected]>
	Thu, 25 Dec 2008 10:40:30 +0000 (11:40 +0100)
		1	2
Documentation/sound/alsa/ALSA-Configuration.txt	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history