summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-11-17 11:33:38 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-11-17 11:33:38 +0000
commit9be060f5278dc0d732ebfcf2bf0a293f88b833eb (patch)
tree12f5982ed12b580bb6475ac0263f5a47310320eb /util
parent361cb26827ffd5f24af05b0e473ecd82d6a33bde (diff)
parent10f5a72f70862d299ddbdf226d6dc71fa4ae34dd (diff)
downloadhqemu-9be060f5278dc0d732ebfcf2bf0a293f88b833eb.zip
hqemu-9be060f5278dc0d732ebfcf2bf0a293f88b833eb.tar.gz
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 17 Nov 2015 11:13:05 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" * remotes/stefanha/tags/block-pull-request: virtio-blk: Fix double completion for werror=stop block: make 'stats-interval' an array of ints instead of a string aio-epoll: Fix use-after-free of node disas/arm: avoid clang shifting negative signed warning tpm: avoid clang shifting negative signed warning tests: Ignore recent test binaries docs: update bitmaps.md Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud