Merge remote-tracking branch 'origin/x86/boot' into x86/mm2
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 29 Jan 2013 22:59:09 +0000 (14:59 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 29 Jan 2013 23:10:15 +0000 (15:10 -0800)
commitde65d816aa44f9ddd79861ae21d75010cc1fd003
tree04a637a43b2e52a733d0dcb7595a47057571e7da
parent9710f581bb4c35589ac046b0cfc0deb7f369fc85
parent5dcd14ecd41ea2b3ae3295a9b30d98769d52165f
Merge remote-tracking branch 'origin/x86/boot' into x86/mm2

Coming patches to x86/mm2 require the changes and advanced baseline in
x86/boot.

Resolved Conflicts:
arch/x86/kernel/setup.c
mm/nobootmem.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
12 files changed:
arch/sparc/mm/init_64.c
arch/x86/include/asm/pgtable.h
arch/x86/include/asm/pgtable_types.h
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup.c
arch/x86/mm/init_32.c
arch/x86/mm/init_64.c
arch/x86/xen/mmu.c
include/linux/mm.h
mm/nobootmem.c