summary refs log tree commit diff stats
path: root/io/task.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-03-17 11:27:54 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-03-17 11:27:54 +0000
commit331ac65963ab74dd84659b748affa0b111486f06 (patch)
treef6cfc2b655d997660b63add838cc64f24124cc65 /io/task.c
parent8c4575472494a5dfedfe05e7b58ca9ce3872ad56 (diff)
parent1f3ddfcb258e6e0562467a9644daad3f28597da8 (diff)
downloadfocaccia-qemu-331ac65963ab74dd84659b748affa0b111486f06.tar.gz
focaccia-qemu-331ac65963ab74dd84659b748affa0b111486f06.zip
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>
Diffstat (limited to 'io/task.c')
0 files changed, 0 insertions, 0 deletions