From: Peter Maydell Date: Mon, 6 Jun 2016 11:47:37 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20160606-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8625c3ffc883e8b5bcac345fa7ac5e9fec6fb593;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20160606-1' into staging audio: pa volume fix, some qomifying. # gpg: Signature made Mon 06 Jun 2016 08:01:21 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-audio-20160606-1: hw/audio: QOM'ify milkymist-ac97.c hw/audio: QOM'ify intel-hda hw/audio: QOM cleanup for intel-hda hw/audio: QOM'ify cs4231.c audio: pa: Set volume of recording stream instead of recording device Signed-off-by: Peter Maydell --- 8625c3ffc883e8b5bcac345fa7ac5e9fec6fb593