tree d4779c1392bb8aa800f0e3cb12af9161e8f217db
parent 8c3ff3a7fb9730564554bb65d54455e6ce8ad340
parent 04f9890df1bad2115665b7027e664aaffa44088d
author Takashi Iwai <tiwai@suse.de> 1244611599 +0200
committer Takashi Iwai <tiwai@suse.de> 1244611599 +0200

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