summary refs log tree commit diff stats
path: root/include/hw/qdev-core.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-07-07 10:29:05 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-07-07 10:29:05 +0100
commit5563168c530e2cde8e000ee7aa4afc0ea4d0b42e (patch)
tree683f9339d73eb1f1480672c2586e46deddbeab7e /include/hw/qdev-core.h
parent91d35509903464c7f4b9ed56be223d7370d3597c (diff)
parent69e87b32680a41d9761191443587c595b6f5fc3f (diff)
downloadfocaccia-qemu-5563168c530e2cde8e000ee7aa4afc0ea4d0b42e.tar.gz
focaccia-qemu-5563168c530e2cde8e000ee7aa4afc0ea4d0b42e.zip
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Thu 07 Jul 2016 07:29:44 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:
  tap: vhost busy polling support

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/qdev-core.h')
0 files changed, 0 insertions, 0 deletions