From: Takashi Iwai Date: Wed, 10 Jun 2009 05:26:39 +0000 (+0200) Subject: Merge branch 'topic/oxygen' into for-linus X-Git-Tag: v2.6.31-rc1~363^2~15 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9dea75c70965c240012251dc5845fe0c1a061180;p=~shefty%2Frdma-dev.git 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 --- 9dea75c70965c240012251dc5845fe0c1a061180