diff options
author | Peter Maydell | 2019-01-11 20:09:13 +0100 |
---|---|---|
committer | Peter Maydell | 2019-01-11 20:09:14 +0100 |
commit | 1fa404b60f7ccae99b9db3b187296b6b053805ea (patch) | |
tree | 9b6f35572918637df4c5b71e14eaf88caa29e230 /net/net.c | |
parent | Merge remote-tracking branch 'remotes/kraxel/tags/misc-20190111-pull-request'... (diff) | |
parent | i2c-ddc: fix oob read (diff) | |
download | qemu-1fa404b60f7ccae99b9db3b187296b6b053805ea.tar.gz qemu-1fa404b60f7ccae99b9db3b187296b6b053805ea.tar.xz qemu-1fa404b60f7ccae99b9db3b187296b6b053805ea.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190111-pull-request' into staging
vga: enable virtio test, fix ddc oob read
# gpg: Signature made Fri 11 Jan 2019 13:58:12 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20190111-pull-request:
i2c-ddc: fix oob read
tests/display-vga: Enable virtio-vga test
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/net.c')
0 files changed, 0 insertions, 0 deletions