diff options
| author | Peter Maydell | 2014-11-24 16:01:54 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-11-24 16:01:54 +0100 |
| commit | 3d4a70f80fead02a3b3872790b4c8f07ee804494 (patch) | |
| tree | 57f2f35b50760ef5a604c8ad6334106d76313de3 /qemu-char.c | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | Revert "qemu-img info: show nocow info" (diff) | |
| download | qemu-3d4a70f80fead02a3b3872790b4c8f07ee804494.tar.gz qemu-3d4a70f80fead02a3b3872790b4c8f07ee804494.tar.xz qemu-3d4a70f80fead02a3b3872790b4c8f07ee804494.zip | |
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 'qemu-char.c')
0 files changed, 0 insertions, 0 deletions