From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 20 Feb 2017 13:38:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20170220-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6753e4ed150ca1f94651aad06c031680a0be6cac;p=qemu.git

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

input: add wctablet, ps2 fix

# gpg: Signature made Mon 20 Feb 2017 11:42:12 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-input-20170220-1:
  Add wctablet device
  ps2: fix mouse mappings for right/middle button

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

6753e4ed150ca1f94651aad06c031680a0be6cac