OSDN Git Service

Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20140711-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 11 Jul 2014 16:50:38 +0000 (17:50 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 11 Jul 2014 16:50:38 +0000 (17:50 +0100)
commitab6d3749c4915cd5692633e321f7745dce06fe77
tree0722541107e8f076fdaa754f18c0c36eaf444c39
parentaee230d707155a957c8300ee12049377d3ffebef
parentd16136d22af0fcf0d651de04c9e3cbc7137cc6f9
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20140711-1' into staging

vga: some cirrus fixes.

# gpg: Signature made Fri 11 Jul 2014 10:38:32 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-20140711-1:
  cirrus: Fix host CPU blits
  cirrus: Fix build of debug code
  cirrus_vga: adding sanity check for vram size

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