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

Simple merge