From: Peter Maydell Date: Tue, 17 May 2016 08:16:00 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c98e7937119503d06dbb494b7e4806ec66a27df0;p=qemu.git Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging slirp updates # gpg: Signature made Mon 16 May 2016 20:22:36 BST using RSA key ID FB6B2F1D # gpg: Good signature from "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # 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: Clean up osdep.h related header inclusions slirp: Remove some unused code from slirp.h slirp: Remove obsolete backward-compatibility cruft slirp: Clean up slirp_config.h Signed-off-by: Peter Maydell --- c98e7937119503d06dbb494b7e4806ec66a27df0