OSDN Git Service

Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20151020-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 20 Oct 2015 11:17:53 +0000 (12:17 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 20 Oct 2015 11:17:53 +0000 (12:17 +0100)
commitb38c0494c141e2d7dabb3ecbf380305b74f9e330
tree1660c8b8dcddc6beae81110762191e9575dd4235
parentdf8197836844275ef805c9031008eb3b20a89b83
parent5829b097204189c56dd1fb62c7f827360394bb39
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>