Merge branch 'topic/ice1724-pm' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:55 +0000 (15:32 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:55 +0000 (15:32 +0200)
commit8a3351bbb93b15ec5d35fd4b3e6e971d6285e674
treeec40d226dc962401fa022ad3d862f2ccd01f6817
parentdcb37d509a93710f96ebfd8b653e3653144799f9
parentcd775387244e379ef9b284f9b6aff6ee069f4d12
Merge branch 'topic/ice1724-pm' into for-linus

* topic/ice1724-pm:
  ALSA: ice1724 - Fix section mismatch
  ALSA: ice1724 - Patch for suspend/resume for Audiotrak Prodigy HD2
sound/pci/ice1712/ice1724.c