Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Wed, 11 Mar 2009 19:47:23 +0000 (20:47 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 11 Mar 2009 19:47:23 +0000 (20:47 +0100)
commitaecfcde920da8d32949f6cbbc1fc051b4ef9e7be
treec332ce67ef065978b07a889109394fda421c0581
parente2b8b2808538a91444e78c7db5a30519cadd09b2
parent80370cb758e7ca2692cd9fb5e413d970b1f4b2b2
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
kernel/trace/trace.c