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)
commitac07bcaa8259841905ead3f8cd60b1923ca6c0e5
tree162def1cd53ef477adca17fe06c33a484f6b2e87
parent37bd824a35a60abc73e5fa8816bd5f50c913d69b
parent35ebf1caa4854ad5ba25f3a72967acc064147994
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
kernel/trace/ftrace.c