Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing...
authorIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 10:39:18 +0000 (11:39 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 10:39:18 +0000 (11:39 +0100)
1  2 
include/linux/ftrace.h

Simple merge