summary refs log tree commit diff stats
path: root/scripts/tracetool/format/simpletrace_stap.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-08-14 13:35:33 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-08-14 13:35:33 +0100
commitdef50953bee2cff31cdb78d3e4e7ec443353ab8a (patch)
tree007a78aaec98e707b8bacffac28dd5a37d6c4371 /scripts/tracetool/format/simpletrace_stap.py
parent87ecd4f3408265fc6403dfbe34fb885057f804ec (diff)
parentbd7adc84492e8e31a48917f515b8a5f598d84544 (diff)
downloadfocaccia-qemu-def50953bee2cff31cdb78d3e4e7ec443353ab8a.tar.gz
focaccia-qemu-def50953bee2cff31cdb78d3e4e7ec443353ab8a.zip
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 14 Aug 2017 13:32:10 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:
  qemu-doc: Mention host_net_add/-remove in the deprecation chapter

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/tracetool/format/simpletrace_stap.py')
0 files changed, 0 insertions, 0 deletions