summary refs log tree commit diff stats
path: root/hw/adc
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-06-05 13:53:05 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-06-05 13:53:05 +0100
commit5d2f557b47dfbf8f23277a5bdd8473d4607c681a (patch)
treeb201eb447b39b4d5699a12e616e71398f251c5ce /hw/adc
parentb489f015fbe2bd59d409211f79ea0a8ac5d2a66d (diff)
parentae3887e6f08c0031b669d4613987ee51df8f1769 (diff)
downloadfocaccia-qemu-5d2f557b47dfbf8f23277a5bdd8473d4607c681a.tar.gz
focaccia-qemu-5d2f557b47dfbf8f23277a5bdd8473d4607c681a.zip
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200605-pull-request' into staging
vga: ati security fix, cirrus cleanup.

# gpg: Signature made Fri 05 Jun 2020 12:27:13 BST
# 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-20200605-pull-request:
  hw/display/cirrus_vga: Fix code mis-indentation
  ati-vga: check mm_index before recursive call (CVE-2020-13800)

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