Commit 29e0855c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into staging



# gpg: Signature made Sun 22 Mar 2020 17:07:31 GMT
# gpg:                using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg:                issuer "marcandre.lureau@redhat.com"
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full]
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/slirp-pull-request:
  slirp: update submodule to v4.2.0+

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9b26a610 9c1f4f1b
Loading
Loading
Loading
Loading

slirp @ 55ab21c9

Original line number Diff line number Diff line
Subproject commit 126c04acbabd7ad32c2b018fe10dfac2a3bc1210
Subproject commit 55ab21c9a36852915b81f1b41ebaf3b6509dd8ba