git://ftp.safe.ca / safe / jmp / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cc3c6e 7cf4942 99adcd9)
Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 21:54:23 +0000 (22:54 +0100)
committerIngo 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

diff --cc arch/x86/lguest/boot.c
Simple merge
diff --cc kernel/fork.c
Simple merge
Full containers within linux kernel