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-03-31 10:09:42 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-03-31 10:09:42 +0100
commita0ee3797bf4917b1b7a4554a4dffbb45f387f087 (patch)
treee4e9a419d05c08874dd46e84055e8137b1159a65 /ui/input-linux.c
parentddc2c3a57e0752c0650fdb735a8b8322542d4248 (diff)
parentb4053c64833762f1249b2d704d2da30b5b10c8ff (diff)
downloadfocaccia-qemu-a0ee3797bf4917b1b7a4554a4dffbb45f387f087.tar.gz
focaccia-qemu-a0ee3797bf4917b1b7a4554a4dffbb45f387f087.zip
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Fri 31 Mar 2017 01:50:55 BST
# gpg:                using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  e1000: disable debug by default
  virtio-net: avoid call tap_enable when there's only one queue

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