diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-12 09:34:52 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-12 09:34:52 +0100 |
| commit | 42bb626f7ebc9197d2943b897a99e127315275ab (patch) | |
| tree | e9466a55cb1b27f90a02d2e53aaf4a67de9c9ec7 /hw/display | |
| parent | 4e71220387e88a22e03e47cabd5aafe105147746 (diff) | |
| parent | 9ca3003df3c9882925c023c1411ab3b2041d7db5 (diff) | |
| download | qemu-42bb626f7ebc9197d2943b897a99e127315275ab.tar.gz qemu-42bb626f7ebc9197d2943b897a99e127315275ab.tar.bz2 qemu-42bb626f7ebc9197d2943b897a99e127315275ab.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 12 Apr 2016 09:29:54 BST 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:
MAINTAINERS: Add Fam Zheng as a co-maintainer of block I/O path
mirror: Replace bdrv_drain(bs) with bdrv_co_drain(bs)
block: Fix bdrv_drain in coroutine
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display')
0 files changed, 0 insertions, 0 deletions