| commit | 1eca9acbf9cda6437db7de1097c7a18014b1289d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Feb 28 10:39:36 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Feb 28 10:39:36 2010 -0800 |
| tree | 04c03ae847df74e45eac2eba5920761986a779c6 | |
| parent | 0091945b4732469bb39bbb4556ce08a25d89d1c2 [diff] | |
| parent | ca2107c9d6cf44fb915402d6f12b9d9ff3925cd7 [diff] |
Merge branch 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, numa: Remove configurable node size support for numa emulation x86, numa: Add fixed node size option for numa emulation x86, numa: Fix numa emulation calculation of big nodes x86, acpi: Map hotadded cpu to correct node.