summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-04-18 16:18:15 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-04-18 16:18:15 +0100
commitd1263f8f1805ffe6a9da8520a6aa96062bc794f4 (patch)
treec5fa1810e634b8bd725bd2eaafccffb4362c1552 /VERSION
parent9c6b899f7a46893ab3b671e341a2234e9c0c060e (diff)
parent91af091f92358c2ff828fa1def1a7bea9b701cdf (diff)
downloadqemu-d1263f8f1805ffe6a9da8520a6aa96062bc794f4.tar.gz
Merge remote-tracking branch 'remotes/famz/tags/block-pull-request' into staging
# gpg: Signature made Tue 18 Apr 2017 15:58:32 BST # gpg: using RSA key 0xCA35624C6A9171C6 # gpg: Good signature from "Fam Zheng <famz@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6 * remotes/famz/tags/block-pull-request: block: Drain BH in bdrv_drained_begin block: Walk bs->children carefully in bdrv_drain_recurse Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions