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

author Ingo Molnar <mingo@elte.hu>

Tue, 10 Mar 2009 21:54:23 +0000 (22:54 +0100)

committer Ingo Molnar <mingo@elte.hu>

Tue, 10 Mar 2009 21:54:23 +0000 (22:54 +0100)
author Ingo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 21:54:23 +0000 (22:54 +0100)
committer Ingo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 21:54:23 +0000 (22:54 +0100)
diff --cc arch/x86/lguest/boot.c
Simple merge
diff --cc kernel/fork.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Tue, 10 Mar 2009 21:54:23 +0000 (22:54 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 10 Mar 2009 21:54:23 +0000 (22:54 +0100)
		1	2	3
arch/x86/lguest/boot.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
kernel/fork.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history