From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 21 Jul 2014 17:06:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.1' into staging
X-Git-Tag: v2.1.0-rc3~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35858955e6c6f9ef41c199d15457c13426ac6434;p=thirdparty%2Fqemu.git

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

QOM and device refactorings

* Machine: Property name fixups for 2.1 ABI

# gpg: Signature made Mon 21 Jul 2014 18:00:23 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-2.1:
  machine: Replace underscores in machine's property names

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

35858955e6c6f9ef41c199d15457c13426ac6434