Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/core
Ingo Molnar [Tue, 10 Mar 2009 21:54:23 +0000 (22:54 +0100)]
1  2  3 
arch/x86/lguest/boot.c
kernel/fork.c

Simple merge
diff --cc kernel/fork.c
Simple merge