summary refs log tree commit diff stats
path: root/hw/arm/boot.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-12-17 19:22:41 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-12-17 19:22:42 +0000
commitb574f602680d41c4cf4a9c106e3e2244bed01cdd (patch)
tree937dc4627f8a1a5be739cdbf69cc21c3eae05172 /hw/arm/boot.c
parent86b182ac0e0b44726d85598cbefb468ed22517fc (diff)
parent46817e86fc1d97af0a7d9e4060730f7b00183083 (diff)
downloadfocaccia-qemu-b574f602680d41c4cf4a9c106e3e2244bed01cdd.tar.gz
focaccia-qemu-b574f602680d41c4cf4a9c106e3e2244bed01cdd.zip
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>
Diffstat (limited to 'hw/arm/boot.c')
0 files changed, 0 insertions, 0 deletions