From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 24 Mar 2016 16:00:14 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160324-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f18f2e7cfcdc31d7f82af15947aae60c4b16e131;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160324-1' into staging

input-linux + spice fixes

# gpg: Signature made Thu 24 Mar 2016 07:54:45 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-ui-20160324-1:
  spice: Disallow use of gl + TCP port
  input-linux: fix Coverity warning
  input-linux: switch over to -object

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

f18f2e7cfcdc31d7f82af15947aae60c4b16e131