Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150122-1' into staging
commit8f970eff6e318524f189f105c236e47633759890
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 22 Jan 2015 17:41:59 +0000 (22 17:41 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 22 Jan 2015 17:41:59 +0000 (22 17:41 +0000)
tree1ce1b4784bef7696db3a86db32e06674fee3b6f1
parentadeecf14d668f5f0a73c9be91772e15b4f8727f3
parent0ee4de5840ccc1072459ec68062bfb63c888a94d
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150122-1' into staging

input: misc fixes.

# gpg: Signature made Thu 22 Jan 2015 11:27:37 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-20150122-1:
  hw/input/hid.c Fix capslock hid code
  hid: handle full ptr queues in post_load
  input: improve docs for input-send-event qmp command

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