From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 29 May 2015 10:23:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150529-1' into staging
X-Git-Tag: v2.4.0-rc0~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9441aa282bc3213ef0530cab86f318b877bac25c;p=thirdparty%2Fqemu.git

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

kbd: add support for brazilian keyboard (two extra keys).
input: add virtio-input devices.

# gpg: Signature made Fri May 29 10:09:02 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-20150529-1:
  virtio-input: emulated devices [device]
  virtio-input: core code & base class [device]
  virtio-input: add linux/input.h
  kbd: add brazil kbd keys to x11 evdev map
  kbd: add brazil kbd keys to qemu

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

9441aa282bc3213ef0530cab86f318b877bac25c