tree 95af63041b79c43be37d734da6073fc82070f769
parent ac2cbab21f318e19bc176a7f38a120cec835220f
parent 07f4207a305c834f528d08428df4531744e25678
author H. Peter Anvin <hpa@linux.intel.com> 1359714306 -0800
committer H. Peter Anvin <hpa@linux.intel.com> 1359714516 -0800

Merge remote-tracking branch 'origin/x86/mm' into x86/mm2

Explicitly merging these two branches due to nontrivial conflicts and
to allow further work.

Resolved Conflicts:
	arch/x86/kernel/head32.c
	arch/x86/kernel/head64.c
	arch/x86/mm/init_64.c
	arch/x86/realmode/init.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>