Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing/core

author Ingo Molnar <mingo@elte.hu>

Mon, 2 Mar 2009 21:37:35 +0000 (22:37 +0100)

committer Ingo Molnar <mingo@elte.hu>

Mon, 2 Mar 2009 21:37:35 +0000 (22:37 +0100)
author Ingo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 21:37:35 +0000 (22:37 +0100)
committer Ingo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 21:37:35 +0000 (22:37 +0100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 2 Mar 2009 21:37:35 +0000 (22:37 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 2 Mar 2009 21:37:35 +0000 (22:37 +0100)
		1	2	3
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history