From: H. Peter Anvin <hpa@linux.intel.com>
Date: Tue, 29 Jan 2013 22:59:09 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/x86/boot' into x86/mm2
X-Git-Tag: v3.9-rc1~105^2~45
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de65d816aa44f9ddd79861ae21d75010cc1fd003;p=pandora-kernel.git

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

de65d816aa44f9ddd79861ae21d75010cc1fd003
Reading git-diff-tree failed