Merge branch 'fix/oxygen' into for-linus
commitdbe45d0ce394732cc06187e929697fc0fb16aa53
authorTakashi Iwai <tiwai@suse.de>
Thu, 2 Jul 2009 15:48:34 +0000 (2 17:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 2 Jul 2009 15:48:34 +0000 (2 17:48 +0200)
treef1d51e0fc97e551eee8d779b4f0e341f4852e3d7
parent4413c8d2be530d7310feaceaae28350b316b2068
parent826390796d09444b93e1f957582f8970ddfd9b3d
Merge branch 'fix/oxygen' into for-linus

* fix/oxygen:
  sound: virtuoso: fix Xonar D1/DX silence after resume