diff options
| author | Peter Maydell | 2015-10-20 13:17:53 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-10-20 13:17:53 +0200 |
| commit | b38c0494c141e2d7dabb3ecbf380305b74f9e330 (patch) | |
| tree | 1660c8b8dcddc6beae81110762191e9575dd4235 /net/net.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-fw_cfg-20151020-1' int... (diff) | |
| parent | vmsvga: more cursor checks (diff) | |
| download | qemu-b38c0494c141e2d7dabb3ecbf380305b74f9e330.tar.gz qemu-b38c0494c141e2d7dabb3ecbf380305b74f9e330.tar.xz qemu-b38c0494c141e2d7dabb3ecbf380305b74f9e330.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20151020-1' into staging
vga: enable virtio-vga for pseries, vmsvga cursor checks.
# gpg: Signature made Tue 20 Oct 2015 08:27:44 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-20151020-1:
vmsvga: more cursor checks
ppc/spapr: Allow VIRTIO_VGA
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/net.c')
0 files changed, 0 insertions, 0 deletions