git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd79481 73cf624)
Merge branch 'x86/urgent' into core/memblock
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 12 Oct 2010 00:05:11 +0000 (17:05 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 12 Oct 2010 00:05:11 +0000 (17:05 -0700)
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>

Trivial merge
Pandora Kernel Repository