From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 28 Feb 2017 13:41:03 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
X-Git-Tag: v2.9.0-rc0~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8c0a1a784cdf70ecea50e93213137c6c89337a7;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

# gpg: Signature made Tue 28 Feb 2017 04:34:34 GMT
# gpg:                using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  iscsi: add missing colons to the qapi docs
  block/mirror: fix broken sparseness detection

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

c8c0a1a784cdf70ecea50e93213137c6c89337a7