commit | 3d4a70f80fead02a3b3872790b4c8f07ee804494 | [log] [tgz] |
---|---|---|
author | Peter Maydell <peter.maydell@linaro.org> | Mon Nov 24 15:01:54 2014 +0000 |
committer | Peter Maydell <peter.maydell@linaro.org> | Mon Nov 24 15:01:54 2014 +0000 |
tree | 57f2f35b50760ef5a604c8ad6334106d76313de3 | |
parent | a31a7475e930dc0b8f27fb71f01ff4f0db92d1f4 [diff] | |
parent | 24bf10dac389942b58f0d24e96590c927251b3d6 [diff] |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging Block patches for 2.2.0-rc3 # gpg: Signature made Mon 24 Nov 2014 12:52:23 GMT using RSA key ID C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" * remotes/kevin/tags/for-upstream: Revert "qemu-img info: show nocow info" Signed-off-by: Peter Maydell <peter.maydell@linaro.org>