Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/core
commit4dd163a0512eb91bbcf4e66d2f65b8e4042561b3
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 21:54:23 +0000 (10 22:54 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 21:54:23 +0000 (10 22:54 +0100)
tree88f8f450ef038c36f3620c79635b2e22e3b0528a
parent6cc3c6e12bb039047974ad2e7e2d46d15a1b762f
parent7cf49427042400d40bdc80b5c3399b6b5945afa8
parent99adcd9d67aaf04e28f5ae96df280f236bde4b66
Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/core
arch/x86/lguest/boot.c
kernel/fork.c