git://ftp.safe.ca / safe / jmp / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b49061 64e7130)
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Fri, 27 Feb 2009 08:04:43 +0000 (09:04 +0100)
committerIngo 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

diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/ia64/Kconfig
Simple merge
Full containers within linux kernel