diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-26 14:01:52 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-26 14:01:52 +0100 |
commit | 5ce1b1ed27d4ab1d81b8543a96f488bba2071576 (patch) | |
tree | 6124a034fce0277570e5f10699337e20b564cbd1 /kernel/trace/kmemtrace.c | |
parent | trace, lockdep: manual preempt count adding for local_bh_disable (diff) | |
parent | tracing/function-graph-tracer: various fixes and features (diff) | |
download | linux-5ce1b1ed27d4ab1d81b8543a96f488bba2071576.tar.xz linux-5ce1b1ed27d4ab1d81b8543a96f488bba2071576.zip |
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core
Diffstat (limited to 'kernel/trace/kmemtrace.c')
0 files changed, 0 insertions, 0 deletions