summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-22 18:09:35 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-22 18:09:35 +0100
commit843adf2379c18ed9a1b7493ee208bfd5512732e0 (patch)
treea741408d3ec679fcb08134882e2c7203a80621aa /arch/x86
parenttracing/function-graph-tracer: make set_graph_function file support ftrace regex (diff)
parentMerge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/penb... (diff)
parenttracing/markers: make markers select tracepoints (diff)
downloadlinux-843adf2379c18ed9a1b7493ee208bfd5512732e0.tar.xz
linux-843adf2379c18ed9a1b7493ee208bfd5512732e0.zip
Merge branches 'tracing/function-graph-tracer', 'tracing/kmemtrace' and 'tracing/markers' into tracing/core