Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...

author Ingo Molnar <mingo@elte.hu>

Wed, 18 Mar 2009 05:59:56 +0000 (06:59 +0100)

committer Ingo Molnar <mingo@elte.hu>

Wed, 18 Mar 2009 05:59:56 +0000 (06:59 +0100)
author Ingo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:59:56 +0000 (06:59 +0100)
committer Ingo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:59:56 +0000 (06:59 +0100)
diff --cc kernel/trace/trace.c
Simple merge
diff --cc kernel/trace/trace.h
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 18 Mar 2009 05:59:56 +0000 (06:59 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 18 Mar 2009 05:59:56 +0000 (06:59 +0100)
		1	2
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	patch \|	diff1 \|	diff2 \|	blob \| history