]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-12-02' into queue...
authorKevin Wolf <kwolf@redhat.com>
Wed, 2 Dec 2015 15:38:03 +0000 (16:38 +0100)
committerKevin Wolf <kwolf@redhat.com>
Wed, 2 Dec 2015 15:38:03 +0000 (16:38 +0100)
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>

Trivial merge