H. Peter Anvin 8e4029ee35 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>

2010-10-11 17:05:11 -07:00

151 KiB

Raw Blame History

View Raw