From: Peter Maydell Date: Fri, 1 Apr 2016 10:15:20 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault-2' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=de1d099a448beb2ec39af4bd9ce4dd6452a18cb5;p=qemu.git Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault-2' into staging slirp updates (2) # gpg: Signature made Thu 31 Mar 2016 23:19:08 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 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: F632 74CD C630 0873 CB3D 29D9 E3E5 1CE8 FB6B 2F1D * remotes/thibault/tags/samuel-thibault-2: slirp: Fix migration from older versions of QEMU to the current one Signed-off-by: Peter Maydell --- de1d099a448beb2ec39af4bd9ce4dd6452a18cb5