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

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>