diff options
author | Peter Maydell | 2015-07-03 13:05:31 +0200 |
---|---|---|
committer | Peter Maydell | 2015-07-03 13:05:31 +0200 |
commit | 35360642d043c2a5366e8a04a10e5545e7353bd5 (patch) | |
tree | 199b00c475dfa1a15eefe6a84fc065498092f346 /include/hw/mem/pc-dimm.h | |
parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150702-v3' into sta... (diff) | |
parent | update pci-bridge-seat section in docs/multiseat.txt (diff) | |
download | qemu-35360642d043c2a5366e8a04a10e5545e7353bd5.tar.gz qemu-35360642d043c2a5366e8a04a10e5545e7353bd5.tar.xz qemu-35360642d043c2a5366e8a04a10e5545e7353bd5.zip |
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/pc-dimm.h')
0 files changed, 0 insertions, 0 deletions