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

author Ingo Molnar <mingo@elte.hu>

Fri, 27 Feb 2009 08:04:43 +0000 (09:04 +0100)

committer Ingo Molnar <mingo@elte.hu>

Fri, 27 Feb 2009 08:04:43 +0000 (09:04 +0100)
author Ingo Molnar <mingo@elte.hu>
Fri, 27 Feb 2009 08:04:43 +0000 (09:04 +0100)
committer Ingo Molnar <mingo@elte.hu>
Fri, 27 Feb 2009 08:04:43 +0000 (09:04 +0100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/ia64/Kconfig
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 27 Feb 2009 08:04:43 +0000 (09:04 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 27 Feb 2009 08:04:43 +0000 (09:04 +0100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history