From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 6 Jul 2016 09:23:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fc5d0a2b243ad7bd4db1f29e6e274507df54a8a8;p=qemu.git

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging

QOM infrastructure fixes and device conversions

* Documentation fix

# gpg: Signature made Wed 06 Jul 2016 08:26:49 BST
# gpg:                using RSA key 0xFA2ED12D3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"
# Primary key fingerprint: 174F 0347 1BCC 221A 6175  6F96 FA2E D12D 3E7E 013F

* remotes/afaerber/tags/qom-devices-for-peter:
  qom: Fix comment typo

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

fc5d0a2b243ad7bd4db1f29e6e274507df54a8a8