From: H. Peter Anvin <hpa@linux.intel.com>
Date: Tue, 12 Oct 2010 00:05:11 +0000 (-0700)
Subject: Merge branch 'x86/urgent' into core/memblock
X-Git-Tag: v2.6.37-rc1~183^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e4029ee3517084ae00fbfbcb51cc365d8857061;p=pandora-kernel.git

Merge branch 'x86/urgent' into core/memblock

Reason for merge:

Forward-port urgent change to arch/x86/mm/srat_64.c to the memblock tree.

Resolved Conflicts:
	arch/x86/mm/srat_64.c

Originally-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---

8e4029ee3517084ae00fbfbcb51cc365d8857061
Reading git-diff-tree failed