From: Peter Maydell Date: Thu, 28 Aug 2014 13:51:12 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/fix-buildbot-12082014-pull-reques... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=795c050e379ab21b75fc2bbb30699fe8752be157;p=qemu.git Merge remote-tracking branch 'remotes/stefanha/tags/fix-buildbot-12082014-pull-request' into staging Pull request # gpg: Signature made Thu 28 Aug 2014 13:43:00 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/fix-buildbot-12082014-pull-request: Revert "qemu-img: sort block formats in help message" block: sort formats alphabetically in bdrv_iterate_format() mirror: fix uninitialized variable delay_ns warnings trace: avoid Python 2.5 all() in tracetool libqtest: launch QEMU with QEMU_AUDIO_DRV=none qapi.py: avoid Python 2.5+ any() function Signed-off-by: Peter Maydell --- 795c050e379ab21b75fc2bbb30699fe8752be157