From: H. Peter Anvin <hpa@linux.intel.com>
Date: Fri, 1 Feb 2013 10:25:06 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/x86/mm' into x86/mm2
X-Git-Tag: v3.9-rc1~108^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68d00bbebb5a48b7a9056a8c03476a71ecbc30a6;p=pandora-kernel.git

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>
---

68d00bbebb5a48b7a9056a8c03476a71ecbc30a6
Reading git-diff-tree failed