diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-14 16:22:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-14 16:22:17 +0000 |
| commit | 618a5a8bc52ba0f2ecbb3dffd01e657f4d841f75 (patch) | |
| tree | a3980391e418a9789d3168a1b4a22c03c81f7425 /slirp/ip6_icmp.h | |
| parent | 6dcea614251e01d99c352056baffed6b39bd4b26 (diff) | |
| parent | f2d089425d43735b5369f70f3a36b712440578e5 (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Mon 14 Mar 2016 11:27:01 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/tracing-pull-request:
trace: separate MMIO tracepoints from TB-access tracepoints
trace: include CPU index in trace_memory_region_*()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/ip6_icmp.h')
0 files changed, 0 insertions, 0 deletions