From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 17 Dec 2014 19:22:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20141216-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b574f602680d41c4cf4a9c106e3e2244bed01cdd;p=qemu.git

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

cirrus hwcursor fixes.
set secondary-vga category.

# gpg: Signature made Tue 16 Dec 2014 14:44:09 GMT 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-20141216-1:
  vga: set catagory bit for secondary vga device
  move hw cursor pos from cirrus to vga
  cirrus: Force use of shadow pixmap when HW cursor is enabled
  vga: Add mechanism to force the use of a shadow surface

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

b574f602680d41c4cf4a9c106e3e2244bed01cdd