From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 11 Mar 2014 12:52:08 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-5' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c57ec3249e9839c7ea2e3789f6e40f9ec1c92f55;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-5' into staging

input: fixes for the rewrite.

# gpg: Signature made Mon 10 Mar 2014 12:50:25 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-input-5:
  input: map INPUT_BUTTON_WHEEL_{UP,DOWN} to legacy input z axis moves.
  input: sdl: fix guest_cursor logic.

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

c57ec3249e9839c7ea2e3789f6e40f9ec1c92f55