Merge branch 'topic/oxygen' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:39 +0000 (07:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:39 +0000 (07:26 +0200)
commit9dea75c70965c240012251dc5845fe0c1a061180
treed4779c1392bb8aa800f0e3cb12af9161e8f217db
parent8c3ff3a7fb9730564554bb65d54455e6ce8ad340
parent04f9890df1bad2115665b7027e664aaffa44088d
Merge branch 'topic/oxygen' into for-linus

* topic/oxygen:
  sound: virtuoso: add Xonar Essence ST support
  sound: virtuoso: enable HDAV S/PDIF input
  sound: virtuoso: add another DX PCI ID
  sound: oxygen: reset DMA when stream is closed
Documentation/sound/alsa/ALSA-Configuration.txt
sound/pci/Kconfig