diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-11-24 15:01:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-24 15:01:54 +0000 |
| commit | 3d4a70f80fead02a3b3872790b4c8f07ee804494 (patch) | |
| tree | 57f2f35b50760ef5a604c8ad6334106d76313de3 /hw | |
| 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>
Diffstat (limited to 'hw')
0 files changed, 0 insertions, 0 deletions