diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-27 17:09:55 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-27 17:09:55 +0000 |
| commit | 944fdc5e27a5b5adbb765891e8e70e88ba9a00ec (patch) | |
| tree | dbc063a4ec7f1f4636dd807629de6d5157569b57 /hw/ide/atapi.c | |
| parent | ea8208249d1082eae0444934efb3b59cd3183f05 (diff) | |
| parent | 37c0c885d19a4c2d69faed891b5c02aaffbdccfb (diff) | |
Merge remote-tracking branch 'remotes/elmarco/tags/libslirp-pull-request' into staging
# gpg: Signature made Fri 27 Nov 2020 17:06:28 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/libslirp-pull-request:
slirp: update to fix CVE-2020-29129 CVE-2020-29130
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/atapi.c')
0 files changed, 0 insertions, 0 deletions