diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-15 09:25:08 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-15 09:25:08 -0800 |
| commit | 0da3e7f526fde7a6522a3038b7ce609fc50f6707 (patch) | |
| tree | c6e2dacd96fe7eac8312f3d7c22e0995dc423879 /arch/mips/include/asm/mach-netlogic/multi-node.h | |
| parent | x86, mm: Move reserving low memory later in initialization (diff) | |
| parent | Merge remote-tracking branch 'origin/x86/mm' into x86/mm2 (diff) | |
| download | linux-0da3e7f526fde7a6522a3038b7ce609fc50f6707.tar.gz linux-0da3e7f526fde7a6522a3038b7ce609fc50f6707.zip | |
Merge branch 'x86/mm2' into x86/mm
x86/mm2 is testing out fine, but has developed conflicts with x86/mm
due to patches in adjacent code. Merge them so we can drop x86/mm2
and have a unified branch.
Resolved Conflicts:
arch/x86/kernel/setup.c
Diffstat (limited to 'arch/mips/include/asm/mach-netlogic/multi-node.h')
0 files changed, 0 insertions, 0 deletions