diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 19:39:36 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 19:39:36 +0100 |
commit | 1eca9acbf9cda6437db7de1097c7a18014b1289d (patch) | |
tree | 04c03ae847df74e45eac2eba5920761986a779c6 /arch/um/drivers/line.c | |
parent | Merge branch 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | x86, numa: Remove configurable node size support for numa emulation (diff) | |
download | linux-1eca9acbf9cda6437db7de1097c7a18014b1289d.tar.xz linux-1eca9acbf9cda6437db7de1097c7a18014b1289d.zip |
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.
Diffstat (limited to 'arch/um/drivers/line.c')
0 files changed, 0 insertions, 0 deletions