From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 20 Oct 2015 11:17:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20151020-1' into staging
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b38c0494c141e2d7dabb3ecbf380305b74f9e330;p=qmiga%2Fqemu.git

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

vga: enable virtio-vga for pseries, vmsvga cursor checks.

# gpg: Signature made Tue 20 Oct 2015 08:27: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-20151020-1:
  vmsvga: more cursor checks
  ppc/spapr: Allow VIRTIO_VGA

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

b38c0494c141e2d7dabb3ecbf380305b74f9e330