From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 11 Jul 2014 16:50:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20140711-1' into staging
X-Git-Tag: qemu-xen-4.6.0-rc1~312
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ab6d3749c4915cd5692633e321f7745dce06fe77;p=qemu-upstream-4.6-testing.git

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>
---

ab6d3749c4915cd5692633e321f7745dce06fe77