Merge branch 'topic/oxygen' into to-push
authorTakashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:30 +0000 (11:40 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:30 +0000 (11:40 +0100)
commitcc4910850f93a8bb1cbafad038fd40f6da68c783
tree78cec60ca8c6fa3d262a85373a8719a973a10dda
parenta8022697811c3f2271df5ec14fa6f518b731b46a
parentde04b102bfc9a13e96f0892305b394077ffb6514
Merge branch 'topic/oxygen' into to-push
Documentation/sound/alsa/ALSA-Configuration.txt
sound/pci/Kconfig