diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-24 17:48:01 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-24 17:48:01 +0100 |
| commit | 62b9b076d9d37117696ec64f0b3544c1205ff7f9 (patch) | |
| tree | cb56b7f7ee9b99669b51fc2cd5354e5330057e26 /linux-user/main.c | |
| parent | 45eabb2ede0caf2f3dd0e1ace045d0915c53ef4d (diff) | |
| parent | dbb2e4726c76dbffb39efe6623bf75d2ec1db8bc (diff) | |
| download | focaccia-qemu-62b9b076d9d37117696ec64f0b3544c1205ff7f9.tar.gz focaccia-qemu-62b9b076d9d37117696ec64f0b3544c1205ff7f9.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180524-pull-request' into staging
vga: catch depth 0 hw/display: add new bochs-display device some cleanups. # gpg: Signature made Thu 24 May 2018 16:45:46 BST # gpg: using RSA key 4CB6D8EED3E87138 # 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>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/vga-20180524-pull-request: MAINTAINERS: add vga entries bochs-display: add pcie support bochs-display: add dirty tracking support hw/display: add new bochs-display device vga-pci: use PCI_VGA_MMIO_SIZE vga: move bochs vbe defines to header file vga: catch depth 0 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/main.c')
0 files changed, 0 insertions, 0 deletions