Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
Ingo Molnar [Tue, 10 Mar 2009 21:55:31 +0000 (22:55 +0100)]
1  2 
kernel/trace/blktrace.c
kernel/trace/trace.c
kernel/trace/trace_functions_graph.c
kernel/trace/trace_workqueue.c

Simple merge
Simple merge
Simple merge
Simple merge