From: Peter Maydell Date: Wed, 22 Jul 2015 15:22:49 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/elmarco/tags/for-upstream' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3edf6b3f1e68104dba692337fdcecdba39e73c59;p=qmiga%2Fqemu.git Merge remote-tracking branch 'remotes/elmarco/tags/for-upstream' into staging qxl: build fix for 2.4 # gpg: Signature made Wed Jul 22 15:55:00 2015 BST using DSA key ID F43F0992 # gpg: Good signature from "Marc-André Lureau " # gpg: aka "Marc-Andre Lureau " # gpg: aka "Marc-Andre Lureau " # gpg: aka "Marc-André Lureau " # gpg: aka "Marc-André Lureau (elmarco) " # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 7346 2483 9404 4E20 ABFF 7D48 D864 9487 F43F 0992 * remotes/elmarco/tags/for-upstream: qxl: Fix new function name for spice-server library Signed-off-by: Peter Maydell --- 3edf6b3f1e68104dba692337fdcecdba39e73c59