summary refs log tree commit diff stats
path: root/hw/usb/dev-network.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-03-16 14:55:59 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-03-16 14:55:59 +0000
commita98135f727595382e200d04c2996e868b7925a01 (patch)
tree5c1a5d485161942607c9d271c1d32aa8ef9d4aae /hw/usb/dev-network.c
parent509f61798b5d1056dfbcbbc64a7c2998740f10d6 (diff)
parentf872c76296b991fde4db5fb87a1cfbd8d4c22c88 (diff)
downloadfocaccia-qemu-a98135f727595382e200d04c2996e868b7925a01.tar.gz
focaccia-qemu-a98135f727595382e200d04c2996e868b7925a01.zip
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200316-pull-request' into staging
vga: stdvga/bochs mmio fix.

# gpg: Signature made Mon 16 Mar 2020 12:48:10 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20200316-pull-request:
  stdvga+bochs-display: add dummy mmio handler

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/dev-network.c')
0 files changed, 0 insertions, 0 deletions