diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-27 10:56:13 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-27 10:56:13 +0100 |
commit | c7cc77307669336a08928ab8668bdb3f3bcc021b (patch) | |
tree | c9f2997a7266cc5d8c5b61e964d8e014f274f5d3 /kernel/trace/trace.h | |
parent | blktrace: port to tracepoints, update (diff) | |
parent | ftrace: adding other non-leaving .text sections (diff) | |
parent | ftrace: add cpu annotation for function graph tracer (diff) | |
parent | tracing: add "power-tracer": C/P state tracer to help power optimization (diff) | |
download | linux-c7cc77307669336a08928ab8668bdb3f3bcc021b.tar.xz linux-c7cc77307669336a08928ab8668bdb3f3bcc021b.zip |
Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/power-tracer' into tracing/core