diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-04 10:49:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-04 10:49:17 +0100 |
| commit | e2c8f9e44e07d8210049abaa6042ec3c956f1dd4 (patch) | |
| tree | 0761da1884d941ba5eba3472748f6743e8774efa /linux-user | |
| parent | 96b39d8327883094f52b0a3d3f25dba83d6d1d63 (diff) | |
| parent | 7b143999f2fbbd576d60a180add163966634fca6 (diff) | |
| download | qemu-e2c8f9e44e07d8210049abaa6042ec3c956f1dd4.zip qemu-e2c8f9e44e07d8210049abaa6042ec3c956f1dd4.tar.gz qemu-e2c8f9e44e07d8210049abaa6042ec3c956f1dd4.tar.bz2 | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates
# gpg: Signature made Sun 03 Jul 2016 23:03:04 BST
# gpg: using RSA key 0xE3E51CE8FB6B2F1D
# gpg: Good signature from "Samuel Thibault <samuel.thibault@gnu.org>"
# gpg: aka "Samuel Thibault <sthibault@debian.org>"
# gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>"
# gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>"
# gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6
# Subkey fingerprint: F632 74CD C630 0873 CB3D 29D9 E3E5 1CE8 FB6B 2F1D
* remotes/thibault/tags/samuel-thibault:
slirp: Add support for stateless DHCPv6
slirp: Remove superfluous memset() calls from the TFTP code
slirp: Add RDNSS advertisement
slirp: Support link-local DNS addresses
slirp: Add dns6 resolution
slirp: Split get_dns_addr
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
0 files changed, 0 insertions, 0 deletions