From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 17 Jul 2015 09:52:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150717-1' into staging
X-Git-Tag: qemu-xen-4.7.0-rc1~160
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fd1a9ef9c2493b5bc98e8e041333a57b635c5d71;p=qemu-xen.git

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

input: fixes for 2.4

# gpg: Signature made Fri Jul 17 07:45:17 2015 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-20150717-1:
  hid: clarify hid_keyboard_process_keycode
  virtio-input: move sys/ioctl.h include
  virtio-input: fix segfault in virtio_input_hid_properties

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

fd1a9ef9c2493b5bc98e8e041333a57b635c5d71