diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-08-14 16:52:34 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-08-14 16:52:34 +0100 |
commit | 074a9925e1cfd659d5376dcaccd1436d3840e611 (patch) | |
tree | 55eaba21dfd87054a46069e79de852d5d440e06e /linux-user/i386 | |
parent | 8e0adf64140ab93aba79be2f0227a47eda78e464 (diff) | |
parent | e424aff5f307227b1c2512bbb8ece891bb895cef (diff) | |
download | hqemu-074a9925e1cfd659d5376dcaccd1436d3840e611.zip hqemu-074a9925e1cfd659d5376dcaccd1436d3840e611.tar.gz |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Fri 14 Aug 2015 14:54:27 BST using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
mirror: Fix coroutine reentrance
block/mirror: limit qiov to IOV_MAX elements
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/i386')
0 files changed, 0 insertions, 0 deletions