diff options
author | Peter Maydell | 2016-07-20 20:41:20 +0200 |
---|---|---|
committer | Peter Maydell | 2016-07-20 20:41:20 +0200 |
commit | 518cb31fa7d2dd648bc400d68c25e0df8394683f (patch) | |
tree | c9513a64fbb922c79f1c5f6846389843537b4cce /net/netmap.c | |
parent | Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into sta... (diff) | |
parent | qxl: fix qxl_set_dirty call in qxl_dirty_one_surface (diff) | |
download | qemu-518cb31fa7d2dd648bc400d68c25e0df8394683f.tar.gz qemu-518cb31fa7d2dd648bc400d68c25e0df8394683f.tar.xz qemu-518cb31fa7d2dd648bc400d68c25e0df8394683f.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160720-1' into staging
qxl: fix qxl_set_dirty call in qxl_dirty_one_surface
# gpg: Signature made Wed 20 Jul 2016 12:28:01 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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/pull-vga-20160720-1:
qxl: fix qxl_set_dirty call in qxl_dirty_one_surface
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/netmap.c')
0 files changed, 0 insertions, 0 deletions