diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-23 13:32:50 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-23 13:32:50 +0100 |
commit | 6966b2a07190004e18ede33ce50a65009b36f3a6 (patch) | |
tree | fc6f9a9585687329bbd6fa763866cb01cbe7b938 /audio/spiceaudio.c | |
parent | a3206972a9eab65ec8e8f9ae320ad628ba4b58f1 (diff) | |
parent | a5d4d7b580f42c47d240a2068c810e4147147f6e (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150623-1' into staging
virtio-input: property fixes, add evdev passthrough
# gpg: Signature made Tue Jun 23 09:33:29 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-20150623-1:
Add MAINTAINERS entry for virtio-input
virtio-input: evdev passthrough
virtio-input: move properties, use virtio_instance_init_common
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'audio/spiceaudio.c')
0 files changed, 0 insertions, 0 deletions