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)
commit44fc6ee92356aa3be31798ced220ab5abd898781
tree45acaa8fe5e620cbf734bdbeb5d48121daa65d0e
parent22de89b371a18086162eacd9f8c960299334ab01
parent5087f8d2a2f2daff5a913d72d8ea3ad601948e10
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
kernel/trace/trace.c