Merge branch 'topic/oxygen' into to-push
Takashi Iwai [Thu, 25 Dec 2008 10:40:30 +0000 (11:40 +0100)]
1  2 
Documentation/sound/alsa/ALSA-Configuration.txt
sound/pci/Kconfig

Simple merge