summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPeter Maydell2017-01-12 16:57:18 +0100
committerPeter Maydell2017-01-12 16:57:18 +0100
commit4201e616c0fa48de99a505a6ade979f0c2c65e28 (patch)
tree8a3e48cb8f1a466d861b241c44ab460699dd9e8a /include
parentMerge remote-tracking branch 'remotes/rth/tags/pull-tcg-20170110' into staging (diff)
parentes1370: wire up reset via DeviceClass (diff)
downloadqemu-4201e616c0fa48de99a505a6ade979f0c2c65e28.tar.gz
qemu-4201e616c0fa48de99a505a6ade979f0c2c65e28.tar.xz
qemu-4201e616c0fa48de99a505a6ade979f0c2c65e28.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20170111-1' into staging
audio: qomify drivers, hotplug fixes. # gpg: Signature made Wed 11 Jan 2017 09:32:09 GMT # gpg: using RSA key 0x4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/pull-audio-20170111-1: es1370: wire up reset via DeviceClass audio: ac97: add exit function audio: es1370: add exit function hw/audio: QOM'ify pl041.c hw/audio: QOM'ify marvell_88w8618.c Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions