Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:59:56 +0000 (06:59 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:59:56 +0000 (06:59 +0100)
commit327019b01e068d66dada6a8b2571180ab3674d20
treec81354a509d6962f6878145fcf3cdbe50a000a89
parent03418c7efaa429dc7647ac93e3862e3fe1816873
parent62524d55e5b9ffe36e3bf3dd7a594114f150b449
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
kernel/trace/trace.c
kernel/trace/trace.h