From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 12 Apr 2016 08:34:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
X-Git-Tag: v2.6.0-rc2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42bb626f7ebc9197d2943b897a99e127315275ab;p=thirdparty%2Fqemu.git

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>
---

42bb626f7ebc9197d2943b897a99e127315275ab