git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 02ac81a 14392fd)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 16 Feb 2011 08:44:04 +0000 (09:44 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 16 Feb 2011 08:44:15 +0000 (09:44 +0100)
commit	52b8b8d7251f8f7b8ed4a6c623618106d83e18b5
tree	13ee81932cba73deb69cd3f386d80e45e6ac23de	tree \| snapshot
parent	02ac81a812fe0575a8475a93bdc22fb291ebad91	commit \| diff
parent	14392fd329eca9b59d51c0aa5d0acfb4965424d1	commit \| diff

Merge branch 'x86/numa' into x86/mm

Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/amdtopology_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/numa_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/srat_64.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree