diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-16 09:26:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-16 09:26:14 +0100 |
| commit | 8a2c26362426a7698c344ecbd13fc96e0d590e22 (patch) | |
| tree | ed257350d666341020d0a7d730648d6939a2bd04 /slirp/libslirp.h | |
| parent | 605c690b1b0e4f36c1e3f427322bdfaa80b9dcbe (diff) | |
| parent | 98792325435d8b46f2035eb93fa02373c7ceda44 (diff) | |
| download | qemu-8a2c26362426a7698c344ecbd13fc96e0d590e22.zip qemu-8a2c26362426a7698c344ecbd13fc96e0d590e22.tar.gz qemu-8a2c26362426a7698c344ecbd13fc96e0d590e22.tar.bz2 | |
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>
Diffstat (limited to 'slirp/libslirp.h')
0 files changed, 0 insertions, 0 deletions