From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 5 Oct 2018 17:52:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181005-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e2e3436add538be0e558cdc42f3e6b76e9deb0f9;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181005-pull-request' into staging

vga: edid fixes, qxl clang workaround, vga mmio subregion fix.

# gpg: Signature made Fri 05 Oct 2018 12:11:40 BST
# 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-20181005-pull-request:
  edid: fix vendor default
  secondary-vga: delete mmio subregions upon exit
  hw/display/qxl: Suppress clang-7 warning about misaligned atomic operation
  edid: Ignore built binary

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

e2e3436add538be0e558cdc42f3e6b76e9deb0f9