Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing...
Ingo Molnar [Wed, 3 Dec 2008 07:49:21 +0000 (08:49 +0100)]
1  2 
kernel/trace/ftrace.c

Simple merge