projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a31a747 24bf10d)
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 24 Nov 2014 15:01:54 +0000 (15:01 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 24 Nov 2014 15:01:54 +0000 (15:01 +0000)
commit3d4a70f80fead02a3b3872790b4c8f07ee804494
tree57f2f35b50760ef5a604c8ad6334106d76313de3tree | snapshot
parenta31a7475e930dc0b8f27fb71f01ff4f0db92d1f4commit | diff
parent24bf10dac389942b58f0d24e96590c927251b3d6commit | 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>
Domain: SDK / Emulator;