Merge branch 'topic/oxygen' into for-linus
Takashi Iwai [Mon, 23 Mar 2009 23:36:17 +0000 (00:36 +0100)]
1  2 
Documentation/sound/alsa/ALSA-Configuration.txt
sound/pci/Kconfig

Simple merge