From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 31 Mar 2015 11:12:22 +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=033a20359aaf93f4d8aa2be12558901e8e028baa;p=qemu.git

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

QOM infrastructure fixes and device conversions

* Fix for adding alias properties with [*]

# gpg: Signature made Tue Mar 31 11:59:00 2015 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-devices-for-peter:
  qom: Fix object_property_add_alias() with [*]

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

033a20359aaf93f4d8aa2be12558901e8e028baa