From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 24 Nov 2014 15:01:54 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3d4a70f80fead02a3b3872790b4c8f07ee804494;p=qemu.git

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>
---

3d4a70f80fead02a3b3872790b4c8f07ee804494