Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20141113-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 13 Nov 2014 11:52:11 +0000 (11:52 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 13 Nov 2014 11:52:11 +0000 (11:52 +0000)
commite08d3004506e39cf25b3e1fa01f69bd1934d2846
tree520c6b6ac0aad3a651c91661b82035003ae712f3
parent410bd787bf44ef95192507802967a0edce19955f
parent51fc44768a5b71ad78fa40e609a58f71ed62775a
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20141113-1' into staging

QMP/input-send-event: make console parameter optional

# gpg: Signature made Thu 13 Nov 2014 10:07:26 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-20141113-1:
  QMP/input-send-event: make console parameter optional
  QMP/input-send-event: update document of union InputEvent

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