git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e990c77 9ea77bd)
Merge branch 'x86-bios-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 20:06:49 +0000 (13:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 20:06:49 +0000 (13:06 -0700)
* 'x86-bios-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, bios: Make the x86 early memory reservation a kernel option
  x86, bios: By default, reserve the low 64K for all BIOSes

1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history
arch/x86/Kconfig patch | diff1 | diff2 | blob | history
arch/x86/kernel/setup.c patch | diff1 | diff2 | blob | history

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