diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-29 15:32:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-29 15:32:15 +0100 |
| commit | 2cc3bdbe2d3908f7a813d1c2d774cc2bf07746cd (patch) | |
| tree | 3b15b5565d3bad53127dbfcd5f2c34218aca6256 /version.rc | |
| parent | 2a90c454a1b90ace56ed908cd064f2fd483d1231 (diff) | |
| parent | 9abe3bdc45ced367fe034c0fdd7c686212389767 (diff) | |
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>
Diffstat (limited to 'version.rc')
0 files changed, 0 insertions, 0 deletions