]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160301-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 1 Mar 2016 10:34:19 +0000 (10:34 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 1 Mar 2016 10:34:19 +0000 (10:34 +0000)
commitd9c7737e57d1c5d8505d09b2803ca140875c9657
tree9aa2e149825bdd194cdf57b2ec625e1e456f0502
parent9c74a853048f14fd9a3e2efa1e3a6935d00e7495
parent05fa1c742fd6f66978b989ded0dd981ef11c4a0c
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160301-1' into staging

vga: minor cirrus/qxl bugfixes.

# gpg: Signature made Tue 01 Mar 2016 07:16:22 GMT 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-20160301-1:
  qxl: lock current_async update in qxl_soft_reset
  cirrus_vga: fix off-by-one in blit_region_is_unsafe

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