Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150703-1' into staging master
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 3 Jul 2015 11:05:31 +0000 (12:05 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 3 Jul 2015 11:05:31 +0000 (12:05 +0100)
commit35360642d043c2a5366e8a04a10e5545e7353bd5
tree199b00c475dfa1a15eefe6a84fc065498092f346
parent5317b0f6d4bb581c5c8f88f31138ee301ad2b7e5
parent496eacaa67653023540e090fb70b7caba429bbc0
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>