diff options
| author | Peter Maydell | 2016-04-01 12:15:20 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-04-01 12:15:20 +0200 |
| commit | de1d099a448beb2ec39af4bd9ce4dd6452a18cb5 (patch) | |
| tree | 0d867a2d94010750fd3744b41c9a6f0ba169f0d7 /net/netmap.c | |
| parent | MAINTAINERS: Delete invalid maintainer entries of the Exynos section (diff) | |
| parent | slirp: Fix migration from older versions of QEMU to the current one (diff) | |
| download | qemu-de1d099a448beb2ec39af4bd9ce4dd6452a18cb5.tar.gz qemu-de1d099a448beb2ec39af4bd9ce4dd6452a18cb5.tar.xz qemu-de1d099a448beb2ec39af4bd9ce4dd6452a18cb5.zip | |
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 <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 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 <peter.maydell@linaro.org>
Diffstat (limited to 'net/netmap.c')
0 files changed, 0 insertions, 0 deletions