From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 13 Nov 2014 11:52:11 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20141113-1' into staging
X-Git-Tag: v2.2.0-rc2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e08d3004506e39cf25b3e1fa01f69bd1934d2846;p=thirdparty%2Fqemu.git

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>
---

e08d3004506e39cf25b3e1fa01f69bd1934d2846