Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:59:56 +0000 (06:59 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:59:56 +0000 (06:59 +0100)
1  2 
kernel/trace/trace.c
kernel/trace/trace.h

Simple merge
Simple merge