Merge branch 'tracing/function-return-tracer' into tracing/fastboot

author Ingo Molnar <mingo@elte.hu>

Wed, 12 Nov 2008 09:17:09 +0000 (10:17 +0100)

committer Ingo Molnar <mingo@elte.hu>

Wed, 12 Nov 2008 09:17:09 +0000 (10:17 +0100)
author Ingo Molnar <mingo@elte.hu>
Wed, 12 Nov 2008 09:17:09 +0000 (10:17 +0100)
committer Ingo Molnar <mingo@elte.hu>
Wed, 12 Nov 2008 09:17:09 +0000 (10:17 +0100)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/trace/ftrace.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 12 Nov 2008 09:17:09 +0000 (10:17 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 12 Nov 2008 09:17:09 +0000 (10:17 +0100)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/ftrace.c	patch \|	diff1 \|	diff2 \|	blob \| history