Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-12-02' into queue...
commitab7fe3a29ab1c6f5a1fff864e455d6d53dde62b5
authorKevin Wolf <kwolf@redhat.com>
Wed, 2 Dec 2015 15:38:03 +0000 (2 16:38 +0100)
committerKevin Wolf <kwolf@redhat.com>
Wed, 2 Dec 2015 15:38:03 +0000 (2 16:38 +0100)
tree8713395eaf503f6626bd5655b30fc4a657922f93
parentc2551b47c9b9465962c4000268eda1307f55614a
parent20873526a329e2145522c29775542dba2900ebe0
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-12-02' into queue-block

One block patch for qemu 2.5-rc3.

# gpg: Signature made Wed Dec  2 16:29:17 2015 CET using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"

* mreitz/tags/pull-block-for-kevin-2015-12-02:
  blkdebug: silence warning under qtest

Signed-off-by: Kevin Wolf <kwolf@redhat.com>