diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-21 18:06:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-21 18:06:12 +0100 |
| commit | 35858955e6c6f9ef41c199d15457c13426ac6434 (patch) | |
| tree | 4c65353b98b5ffac28e35b1555929f832d390f11 /scripts | |
| parent | 147fc419734b057b9d9154c2ca0d9d397054104b (diff) | |
| parent | b0ddb8bf6bf1739240640f353fd49e9e5d3f85dc (diff) | |
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>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions