]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Sun, 22 Mar 2020 21:00:38 +0000 (21:00 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Sun, 22 Mar 2020 21:00:38 +0000 (21:00 +0000)
commit29e0855c5af62bbb0b0b6fed792e004dad92ba95
tree4f8313c0cd98f923f92257f9e54e4ca138dce49e
parent9b26a610936deaf436af9b7e39e4b7f0a35e4409
parent9c1f4f1b9bb4e5df43c4267d519938c1a2aa8e27
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: Peter Maydell <peter.maydell@linaro.org>