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

author Ingo Molnar <mingo@elte.hu>

Fri, 26 Feb 2010 08:20:17 +0000 (09:20 +0100)

committer Ingo Molnar <mingo@elte.hu>

Fri, 26 Feb 2010 08:20:17 +0000 (09:20 +0100)
author Ingo Molnar <mingo@elte.hu>
Fri, 26 Feb 2010 08:20:17 +0000 (09:20 +0100)
committer Ingo Molnar <mingo@elte.hu>
Fri, 26 Feb 2010 08:20:17 +0000 (09:20 +0100)
diff --cc kernel/trace/Kconfig
Simple merge
diff --cc kernel/trace/trace_kprobe.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 26 Feb 2010 08:20:17 +0000 (09:20 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 26 Feb 2010 08:20:17 +0000 (09:20 +0100)
		1	2
kernel/trace/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	patch \|	diff1 \|	diff2 \|	blob \| history