From: Peter Maydell Date: Tue, 1 Mar 2016 10:34:19 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160301-1' into staging X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~30^2~6^2~8^2~142 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9c7737e57d1c5d8505d09b2803ca140875c9657;p=sdk%2Femulator%2Fqemu.git 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) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * 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 --- d9c7737e57d1c5d8505d09b2803ca140875c9657