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