diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-07 10:43:32 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-07 10:43:32 +0100 |
commit | 19eb2d4e736dc895f31fbd6b520e514f10cc08e0 (patch) | |
tree | 03e238a97aa99632b2c017d0b7c372d8ef53691d /qemu-nbd.c | |
parent | a6ae23831b05a11880b40f7d58e332c45a6b04f7 (diff) | |
parent | 52ec9dcc1ed5609674e7b52198c18207bb193548 (diff) | |
download | qemu-19eb2d4e736dc895f31fbd6b520e514f10cc08e0.zip qemu-19eb2d4e736dc895f31fbd6b520e514f10cc08e0.tar.gz qemu-19eb2d4e736dc895f31fbd6b520e514f10cc08e0.tar.bz2 |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
Update slirp submodule
To fix Windows on ARM.
# gpg: Signature made Sat 04 May 2019 13:40:33 BST
# gpg: using RSA key E61DBB15D4172BDEC97E92D9DB550E89F0FA54F3
# gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" [unknown]
# gpg: aka "Samuel Thibault <sthibault@debian.org>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>" [unknown]
# gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" [unknown]
# 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: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6
# Subkey fingerprint: E61D BB15 D417 2BDE C97E 92D9 DB55 0E89 F0FA 54F3
* remotes/thibault/tags/samuel-thibault:
Update slirp submodule
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-nbd.c')
0 files changed, 0 insertions, 0 deletions