Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-5' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 11 Mar 2014 12:52:08 +0000 (12:52 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 11 Mar 2014 12:52:08 +0000 (12:52 +0000)
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>

Trivial merge