diff options
author | Peter Maydell | 2016-07-07 11:29:05 +0200 |
---|---|---|
committer | Peter Maydell | 2016-07-07 11:29:05 +0200 |
commit | 5563168c530e2cde8e000ee7aa4afc0ea4d0b42e (patch) | |
tree | 683f9339d73eb1f1480672c2586e46deddbeab7e /include/hw/timer/imx_gpt.h | |
parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20160706' into staging (diff) | |
parent | tap: vhost busy polling support (diff) | |
download | qemu-5563168c530e2cde8e000ee7aa4afc0ea4d0b42e.tar.gz qemu-5563168c530e2cde8e000ee7aa4afc0ea4d0b42e.tar.xz 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/timer/imx_gpt.h')
0 files changed, 0 insertions, 0 deletions