From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 16 Oct 2014 08:26:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20141015-1' into staging
X-Git-Tag: v2.2.0-rc0~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a2c26362426a7698c344ecbd13fc96e0d590e22;p=thirdparty%2Fqemu.git

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

vga-pci: add qext region to mmio
vga: Remove unused arrays dmask4 and dmask16

# gpg: Signature made Wed 15 Oct 2014 10:12:06 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-20141015-1:
  hw/display/vga: Remove unused arrays dmask4 and dmask16
  vga-pci: add qext region to mmio

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

8a2c26362426a7698c344ecbd13fc96e0d590e22