diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-28 13:22:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-28 13:22:57 +0100 |
| commit | 9f8c5b69c2b9ca8b9c3e569b0f41bd60a0b9e9fe (patch) | |
| tree | 0058d6a0815d9f88485c125de149061027456f82 /block/io.c | |
| parent | 776f87845137a9b300a4815ba6bf6879310795aa (diff) | |
| parent | 325e3904210c779a13fbbc9ee156056d045d7eee (diff) | |
| download | qemu-9f8c5b69c2b9ca8b9c3e569b0f41bd60a0b9e9fe.tar.gz qemu-9f8c5b69c2b9ca8b9c3e569b0f41bd60a0b9e9fe.tar.bz2 qemu-9f8c5b69c2b9ca8b9c3e569b0f41bd60a0b9e9fe.zip | |
Merge remote-tracking branch 'remotes/cody/tags/jtc-for-upstream-pull-request' into staging
# gpg: Signature made Tue Jul 28 05:22:29 2015 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/jtc-for-upstream-pull-request:
block/ssh: Avoid segfault if inet_connect doesn't set errno.
sheepdog: serialize requests to overwrapping area
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/io.c')
0 files changed, 0 insertions, 0 deletions