diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-03 12:05:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-03 12:05:31 +0100 |
| commit | 35360642d043c2a5366e8a04a10e5545e7353bd5 (patch) | |
| tree | 199b00c475dfa1a15eefe6a84fc065498092f346 /include/hw/mem | |
| parent | 5317b0f6d4bb581c5c8f88f31138ee301ad2b7e5 (diff) | |
| parent | 496eacaa67653023540e090fb70b7caba429bbc0 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150703-1' into staging
virtio-input: add input routing support, update multiseat docs.
# gpg: Signature made Fri Jul 3 11:22:33 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-20150703-1:
update pci-bridge-seat section in docs/multiseat.txt
virtio-input: add input routing support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/mem')
0 files changed, 0 insertions, 0 deletions