diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-12 02:05:11 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-12 02:05:11 +0200 |
| commit | 8e4029ee3517084ae00fbfbcb51cc365d8857061 (patch) | |
| tree | 3d86578dc6160781a0c2fdad461e5195e73bfafc /arch/sh/mm | |
| parent | memblock: Annotate memblock functions with __init_memblock (diff) | |
| parent | x86, numa: For each node, register the memory blocks actually used (diff) | |
| download | linux-8e4029ee3517084ae00fbfbcb51cc365d8857061.tar.xz linux-8e4029ee3517084ae00fbfbcb51cc365d8857061.zip | |
Merge branch 'x86/urgent' into core/memblock
Reason for merge:
Forward-port urgent change to arch/x86/mm/srat_64.c to the memblock tree.
Resolved Conflicts:
arch/x86/mm/srat_64.c
Originally-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/sh/mm')
0 files changed, 0 insertions, 0 deletions