diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-29 11:23:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-29 11:23:07 +0100 |
| commit | 9441aa282bc3213ef0530cab86f318b877bac25c (patch) | |
| tree | 8c82245fe6295b71dab3599dfe110e0f8be1254b /memory.c | |
| parent | ba7c388963e099c0d2cedb7f048e30747ffff25d (diff) | |
| parent | 55a1d80a41032d6133adec041c0096820beaa1b7 (diff) | |
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>
Diffstat (limited to 'memory.c')
0 files changed, 0 insertions, 0 deletions