Merge branch 'mainline/function-graph' of git://git.kernel.org/pub/scm/linux/kernel...
authorIngo Molnar <mingo@elte.hu>
Thu, 19 Feb 2009 11:13:33 +0000 (12:13 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 19 Feb 2009 11:13:33 +0000 (12:13 +0100)
commit4cd0332db7e8f57cc082bab11d82c064a9721737
treeb6de7771d67c5bf6eeb890fa0f5a901365104b98
parent40999096e8b9872199bf56ecd0c4d98397ccaf2f
parent712406a6bf59ebf4a00358bb59a4a2a1b2953d90
Merge branch 'mainline/function-graph' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/function-graph-tracer
arch/x86/kernel/dumpstack.c
arch/x86/kernel/ftrace.c
include/linux/ftrace.h
kernel/trace/trace_functions_graph.c