git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51ea8a8 b0f4c06)
Merge branch 'x86/vmware' into x86/trampoline
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 20 Oct 2010 20:18:17 +0000 (13:18 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 20 Oct 2010 20:18:17 +0000 (13:18 -0700)
1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history
arch/x86/kernel/Makefile patch | diff1 | diff2 | blob | history

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