]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2273b9a 4e1e358)
Merge branch 'x86/numa' into x86/mm
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 08:44:04 +0000 (09:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 08:44:15 +0000 (09:44 +0100)
commitc160eda713985d9065bd9497989fce593a3af40c
tree13ee81932cba73deb69cd3f386d80e45e6ac23detree | snapshot
parent2273b9a4b7879b792f8e38cc72f0cc8641ae433ecommit | diff
parent4e1e3584bbe7006190f28691f95385e6e68360ebcommit | 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
Linux Kernel Source Tree.