| commit | cf22132367a188426ac07cf1805b214dd2d0cc80 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 2 Dec 2015 17:05:34 +0000 (2 17:05 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 2 Dec 2015 17:05:34 +0000 (2 17:05 +0000) | ||
| tree | e5d5b056e7b2cb25102b149c65f0d51e61fcb686 | treesnapshot (tar.gz zip) |
| parent | 2196b6f5dd5a07ed95d51f0d5f2f3fb20a076b13 | commitdiff |
| parent | ab7fe3a29ab1c6f5a1fff864e455d6d53dde62b5 | commitdiff |
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>
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>