diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-11-10 16:28:51 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-10 16:28:51 +0000 |
commit | 558c2c8ddfb165a36eb95dc93125c04829d68aa7 (patch) | |
tree | 8de95857795c0e90b4e0154b27805231e961fd7b /pc-bios/vgabios.bin | |
parent | 7a8dda7e5d8035a10812bb9e852576c91de2dcdc (diff) | |
parent | ea3beed41d2eeb33a09f1b538d1caea787a043b6 (diff) | |
download | qemu-558c2c8ddfb165a36eb95dc93125c04829d68aa7.zip qemu-558c2c8ddfb165a36eb95dc93125c04829d68aa7.tar.gz qemu-558c2c8ddfb165a36eb95dc93125c04829d68aa7.tar.bz2 |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches
# gpg: Signature made Mon 10 Nov 2014 09:42:07 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
block/vdi: Limit maximum size even futher
qapi: Complete BlkdebugEvent
iotests: Add test for non-existing backing file
block: Propagate error in bdrv_img_create()
qemu-img: Omit error_report() after img_open()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'pc-bios/vgabios.bin')
0 files changed, 0 insertions, 0 deletions