Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Tue, 17 Mar 2009 09:37:37 +0000 (10:37 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 17 Mar 2009 09:37:37 +0000 (10:37 +0100)
commit4176935b58eeb636917e65a2c388e4607e36cce6
treedac4e0005cda5a3a5a313dde35bbac2877d9bd93
parentc269fc8c537d761f36cb98e637ae934d9331a9d5
parent6adaad14d7d4d3ef31b4e2dc992b18b5da7c4eb3
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