| commit | 781c5a67f152c17c3e4a9ed9647f8c0be6ea5ae9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 13:06:49 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 13:06:49 2010 -0700 |
| tree | 5cba2f98482e4612e4daf8e57e4e50a24a273fe9 | |
| parent | e990c77d06dbacc8e5c5edd2c4a1005d318a4fa6 [diff] | |
| parent | 9ea77bdb39b62c9bf9fd3cdd1c25a9420bccd380 [diff] |
Merge branch 'x86-bios-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * '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