diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-17 11:27:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-17 11:27:54 +0000 |
| commit | 331ac65963ab74dd84659b748affa0b111486f06 (patch) | |
| tree | f6cfc2b655d997660b63add838cc64f24124cc65 /include/qapi/qmp/qerror.h | |
| parent | 8c4575472494a5dfedfe05e7b58ca9ce3872ad56 (diff) | |
| parent | 1f3ddfcb258e6e0562467a9644daad3f28597da8 (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>
Diffstat (limited to 'include/qapi/qmp/qerror.h')
0 files changed, 0 insertions, 0 deletions