git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5dee61 c20137f)
Merge branch 'linus' into tracing/hw-branch-tracing
authorIngo Molnar <mingo@elte.hu>
Wed, 24 Dec 2008 20:08:26 +0000 (21:08 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 24 Dec 2008 20:08:26 +0000 (21:08 +0100)
1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history
arch/x86/Kconfig.cpu patch | diff1 | diff2 | blob | history

diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/x86/Kconfig.cpu
Simple merge
Pandora Kernel Repository