From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 1 May 2014 15:02:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-2' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=87f6ede9bbccc03f337220478fb03fa70fbc3659;p=qemu.git

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

vga: add secondary stdvga variant

# gpg: Signature made Mon 28 Apr 2014 10:11:44 BST using RSA key ID D3E87138
# 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>"

* remotes/kraxel/tags/pull-vga-2:
  add secondary-vga to display-vga test
  add display-vga test
  vga: add secondary stdvga variant
  vga: allow non-global vmstate

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

87f6ede9bbccc03f337220478fb03fa70fbc3659