tree bc8c6dd0941bbcc43604b8f22306084e71409899
parent dc94bd9166af5236a56bd5bb06845911915a925c
parent a52b2cbf218d52f9e357961acb271a98a2bdff71
author Peter Maydell <peter.maydell@linaro.org> 1437578569 +0100
committer Peter Maydell <peter.maydell@linaro.org> 1437578569 +0100
mergetag object a52b2cbf218d52f9e357961acb271a98a2bdff71
 type commit
 tag for-upstream
 tagger Marc-André Lureau <marcandre.lureau@redhat.com> 1437576883 +0200
 
 qxl: build fix for 2.4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlWvrsQACgkQ2GSUh/Q/CZJc1wCfWskM8MOC0jtzx0gjn9n6UfIN
 BIMAoIQBwvSQn8sUudkrhiGrxzPqniZx
 =ha3q
 -----END PGP SIGNATURE-----

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 <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-Andre Lureau <marcandre.lureau@gmail.com>"
# gpg:                 aka "Marc-Andre Lureau <marc-andre.lureau@nokia.com>"
# gpg:                 aka "Marc-André Lureau <marc-andre.lureau@nokia.com>"
# gpg:                 aka "Marc-André Lureau (elmarco) <marcandre.lureau@gmail.com>"
# 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 <peter.maydell@linaro.org>