diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-06 10:23:25 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-06 10:23:25 +0100 |
| commit | fc5d0a2b243ad7bd4db1f29e6e274507df54a8a8 (patch) | |
| tree | 3e35accca27ff2ac6608aaee57aee79f70f4f7f8 /qobject/json-parser.c | |
| parent | 07bee7f4f45e2f956ce566336854b46a74faa2fe (diff) | |
| parent | ada03a0e8423ef8950e30d216f56a9661a4070e2 (diff) | |
| download | qemu-fc5d0a2b243ad7bd4db1f29e6e274507df54a8a8.zip qemu-fc5d0a2b243ad7bd4db1f29e6e274507df54a8a8.tar.gz qemu-fc5d0a2b243ad7bd4db1f29e6e274507df54a8a8.tar.bz2 | |
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>
Diffstat (limited to 'qobject/json-parser.c')
0 files changed, 0 insertions, 0 deletions