summary refs log tree commit diff stats
path: root/ui/input-linux.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-24 16:20:47 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-24 16:20:47 +0100
commitce1d20aac8533357650774c2c240e30de87dc122 (patch)
tree1ca3e10eb8ed839c93a4702250a3b91f74b78f61 /ui/input-linux.c
parent1d1424ba86580ea68503a9b468ce4c8d511c5c9f (diff)
parentc2a3d7dad2e153668b5a004e4f8336da92c476e1 (diff)
downloadfocaccia-qemu-ce1d20aac8533357650774c2c240e30de87dc122.tar.gz
focaccia-qemu-ce1d20aac8533357650774c2c240e30de87dc122.zip
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-07-24' into staging
nbd patches for 2017-07-24

- Eric Blake: [0/2] Update qemu-nbd version

# gpg: Signature made Mon 24 Jul 2017 14:58:23 BST
# gpg:                using RSA key 0xA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2017-07-24:
  maint: Reorder include directives for qemu-{nbd, io}
  qemu-nbd: Update version string

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input-linux.c')
0 files changed, 0 insertions, 0 deletions