projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8c45754 1f3ddfc)
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 17 Mar 2016 11:27:54 +0000 (11:27 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 17 Mar 2016 11:27:54 +0000 (11:27 +0000)
commit331ac65963ab74dd84659b748affa0b111486f06
treef6cfc2b655d997660b63add838cc64f24124cc65tree | snapshot
parent8c4575472494a5dfedfe05e7b58ca9ce3872ad56commit | diff
parent1f3ddfcb258e6e0562467a9644daad3f28597da8commit | diff
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>
Domain: SDK / Emulator;