git.karo-electronics.de Git - linux-beck.git/commit

]> git.karo-electronics.de Git - linux-beck.git/commit

author	H. Peter Anvin <hpa@linux.intel.com>
	Tue, 12 Oct 2010 00:05:11 +0000 (17:05 -0700)
committer	H. Peter Anvin <hpa@linux.intel.com>
	Tue, 12 Oct 2010 00:05:11 +0000 (17:05 -0700)
commit	8e4029ee3517084ae00fbfbcb51cc365d8857061
tree	3d86578dc6160781a0c2fdad461e5195e73bfafc	tree \| snapshot
parent	cd79481d27b9f90aad80c9b972292c42c25bbf8e	commit \| diff
parent	73cf624d029d776a33d0a80c695485b3f9b36231	commit \| diff

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>

arch/x86/mm/srat_64.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history

Beck SC1x5 Kernel

RSS Atom

arch/x86/mm/srat_64.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history