diff options
| author | Peter Maydell | 2015-12-02 18:05:34 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-12-02 18:05:34 +0100 |
| commit | cf22132367a188426ac07cf1805b214dd2d0cc80 (patch) | |
| tree | e5d5b056e7b2cb25102b149c65f0d51e61fcb686 /include/block | |
| parent | Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (diff) | |
| parent | Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-12-02' in... (diff) | |
| download | qemu-cf22132367a188426ac07cf1805b214dd2d0cc80.tar.gz qemu-cf22132367a188426ac07cf1805b214dd2d0cc80.tar.xz qemu-cf22132367a188426ac07cf1805b214dd2d0cc80.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Wed 02 Dec 2015 15:57:35 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
blkdebug: silence warning under qtest
qcow2: Fix potential qemu-img check crash on 32 bit hosts
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/block')
0 files changed, 0 insertions, 0 deletions