diff options
author | Peter Maydell | 2016-03-17 12:27:54 +0100 |
---|---|---|
committer | Peter Maydell | 2016-03-17 12:27:54 +0100 |
commit | 331ac65963ab74dd84659b748affa0b111486f06 (patch) | |
tree | f6cfc2b655d997660b63add838cc64f24124cc65 /scripts/qapi-visit.py | |
parent | Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' int... (diff) | |
parent | Revert "qed: Implement .bdrv_drain" (diff) | |
download | qemu-331ac65963ab74dd84659b748affa0b111486f06.tar.gz qemu-331ac65963ab74dd84659b748affa0b111486f06.tar.xz 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 'scripts/qapi-visit.py')
0 files changed, 0 insertions, 0 deletions