aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-07-28 19:44:03 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-07-28 19:44:03 +0100
commitb1753831b0e58587db4fdf8219237331269c00c3 (patch)
treef3350b652dc03533a8c47455c7b3f12c376a1960 /block
parent3461487523b897d324e8d91f3fd20ed55f849544 (diff)
parent9c15f57891af7c2cb3baf2d66a1b1f3f87a665ba (diff)
Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into staging
slirp: update to latest stable-4.2 branch # gpg: Signature made Tue 28 Jul 2020 15:30:09 BST # 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 to latest stable-4.2 branch test-char: abort on serial test error Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions