summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/ftrace.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-10 13:58:28 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-10 13:58:28 +0100
commitae216dd239765afd592f65d94d8430244cf77ed1 (patch)
treea8e203cd9260be48d07e1484f87023d7d3dbae64 /arch/x86/kernel/ftrace.c
parentMerge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core (diff)
parenttracing: clean up splice code (diff)
downloadlinux-ae216dd239765afd592f65d94d8430244cf77ed1.tar.xz
linux-ae216dd239765afd592f65d94d8430244cf77ed1.zip
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
0 files changed, 0 insertions, 0 deletions