diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 18:09:35 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 18:09:35 +0100 |
commit | 843adf2379c18ed9a1b7493ee208bfd5512732e0 (patch) | |
tree | a741408d3ec679fcb08134882e2c7203a80621aa /arch/x86 | |
parent | tracing/function-graph-tracer: make set_graph_function file support ftrace regex (diff) | |
parent | Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/penb... (diff) | |
parent | tracing/markers: make markers select tracepoints (diff) | |
download | linux-843adf2379c18ed9a1b7493ee208bfd5512732e0.tar.xz linux-843adf2379c18ed9a1b7493ee208bfd5512732e0.zip |
Merge branches 'tracing/function-graph-tracer', 'tracing/kmemtrace' and 'tracing/markers' into tracing/core