| commit | 033a20359aaf93f4d8aa2be12558901e8e028baa | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 31 Mar 2015 11:12:22 +0000 (31 12:12 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 31 Mar 2015 11:12:23 +0000 (31 12:12 +0100) | ||
| tree | 2227dbaf1d923cebde7994b35e8eec1611b32313 | treesnapshot (tar.gz zip) |
| parent | 9e0ad3472dae5236052d455948396d8579bfc904 | commitdiff |
| parent | a18bb417e954ceea0a30b46c38b0d58c3a7ca6a1 | commitdiff |
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>
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>