From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 17 Mar 2016 11:27:54 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=331ac65963ab74dd84659b748affa0b111486f06;p=qemu.git

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Thu 17 Mar 2016 11:08:28 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:
  Revert "qed: Implement .bdrv_drain"
  aio-posix: Change CONFIG_EPOLL to CONFIG_EPOLL_CREATE1

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

331ac65963ab74dd84659b748affa0b111486f06