]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-7' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 1 Apr 2014 15:58:04 +0000 (16:58 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 1 Apr 2014 15:58:04 +0000 (16:58 +0100)
commit507979a8bda895d56d02112907ccbca753dbbdce
tree39f8e2c54fffb8752300adf7d3a27ac3e5700007
parent95224e87a71d3190f46bf543ec9bc59ae36050eb
parentbdcc3a28b7f6ed6b90ad8b8af7b5d17e0d3f1f06
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-7' into staging

input bugfixes for 2.0

# gpg: Signature made Tue 01 Apr 2014 10:16:43 BST 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-7:
  input: add sanity check
  input: mouse_set should check input device type.
  input: fix input_event_key_number trace event

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