From: Peter Maydell Date: Tue, 1 Apr 2014 15:58:04 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-7' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=507979a8bda895d56d02112907ccbca753dbbdce;p=qemu.git 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) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * 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 --- 507979a8bda895d56d02112907ccbca753dbbdce