Merge branch 'topic/oxygen' into for-linus
commitb54fc8dd2c43888f2754505cca2b6e88604a8ffa
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:17 +0000 (24 00:36 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:17 +0000 (24 00:36 +0100)
tree7613f3734b0b91c316438c2fd3814a5565e8593a
parent9fb5430c3d6e96a74fd4406dbe7608f36abb9987
parent873591db59e66434fd0a484c92f69fc21100b33d
Merge branch 'topic/oxygen' into for-linus
Documentation/sound/alsa/ALSA-Configuration.txt
sound/pci/Kconfig