| commit | d24aaf2a2915424962fb101142f28fa4307f4740 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Mon, 6 Nov 2017 11:24:14 +0000 (6 11:24 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Mon, 6 Nov 2017 11:24:14 +0000 (6 11:24 +0000) | ||
| tree | 5b6c8cb938e0f086cc61df6d97ce7a744c4b660f | treesnapshot (tar.gz zip) |
| parent | ec7a8bf0b8f7dc7288fe8745464ee8217528cc6c | commitdiff |
| parent | ef9115dd7c82a196b18cac46784724bdebf01fbc | commitdiff |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Mon 06 Nov 2017 11:20:18 GMT
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
aio-posix: drop QEMU_AIO_POLL_MAX_NS env var
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Mon 06 Nov 2017 11:20:18 GMT
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
aio-posix: drop QEMU_AIO_POLL_MAX_NS env var
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>