From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 4 Jun 2018 14:46:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180604-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5d7ad3ce103af3ab7c860a4ca97653f8ffa6e29c;p=qemu.git

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

Two little vga fixes.

# gpg: Signature made Mon 04 Jun 2018 09:48:53 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-20180604-pull-request:
  vga: cleanup surface handling
  bochs-display: add missing break

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

5d7ad3ce103af3ab7c860a4ca97653f8ffa6e29c