Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorSteven Rostedt <srostedt@redhat.com>
Fri, 13 Mar 2009 01:12:46 +0000 (21:12 -0400)
committerSteven Rostedt <srostedt@redhat.com>
Fri, 13 Mar 2009 01:12:46 +0000 (21:12 -0400)
1  2 
kernel/trace/trace.c

Simple merge