Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Tue, 17 Mar 2009 09:37:37 +0000 (10:37 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 17 Mar 2009 09:37:37 +0000 (10:37 +0100)
1  2 
kernel/trace/trace.c
kernel/trace/trace.h

Simple merge
Simple merge