diff options
author | Peter Maydell | 2017-11-28 12:52:11 +0100 |
---|---|---|
committer | Peter Maydell | 2017-11-28 12:52:11 +0100 |
commit | a914f04c23385953cb2f9b34dc879e03c880d4b2 (patch) | |
tree | d79f62805a2f6b7e04fc82337584e036e54f8535 /block/commit.c | |
parent | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st... (diff) | |
parent | sockets: avoid crash when cleaning up sockets for an invalid FD (diff) | |
download | qemu-a914f04c23385953cb2f9b34dc879e03c880d4b2.tar.gz qemu-a914f04c23385953cb2f9b34dc879e03c880d4b2.tar.xz qemu-a914f04c23385953cb2f9b34dc879e03c880d4b2.zip |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-11-28-1' into staging
Merge qio 2017/11/28 v1
# gpg: Signature made Tue 28 Nov 2017 10:49:08 GMT
# gpg: using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/pull-qio-2017-11-28-1:
sockets: avoid crash when cleaning up sockets for an invalid FD
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/commit.c')
0 files changed, 0 insertions, 0 deletions