projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07bee7f ada03a0)
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 6 Jul 2016 09:23:25 +0000 (10:23 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 6 Jul 2016 09:23:25 +0000 (10:23 +0100)
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>

Trivial merge
Domain: SDK / Emulator;