Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Wed, 18 Feb 2009 00:09:07 +0000 (01:09 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 18 Feb 2009 00:09:07 +0000 (01:09 +0100)
1  2 
kernel/trace/ftrace.c

Simple merge