Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

author Ingo Molnar <mingo@elte.hu>

Tue, 13 Oct 2009 10:03:08 +0000 (12:03 +0200)

committer Ingo Molnar <mingo@elte.hu>

Tue, 13 Oct 2009 10:03:08 +0000 (12:03 +0200)
author Ingo Molnar <mingo@elte.hu>
Tue, 13 Oct 2009 10:03:08 +0000 (12:03 +0200)
committer Ingo Molnar <mingo@elte.hu>
Tue, 13 Oct 2009 10:03:08 +0000 (12:03 +0200)
diff --cc kernel/trace/ftrace.c
Simple merge
diff --cc kernel/trace/trace.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Tue, 13 Oct 2009 10:03:08 +0000 (12:03 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 13 Oct 2009 10:03:08 +0000 (12:03 +0200)
		1	2
kernel/trace/ftrace.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	patch \|	diff1 \|	diff2 \|	blob \| history