OSDN Git Service

Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2015-05-29' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 29 May 2015 14:32:15 +0000 (15:32 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 29 May 2015 14:32:15 +0000 (15:32 +0100)
Block QAPI, monitor, command line patches

# gpg: Signature made Fri May 29 12:02:32 2015 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-block-2015-05-29:
  qapi: add dirty bitmap status

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

Trivial merge