]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/amd-nb' into x86/mm
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 08:45:33 +0000 (09:45 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Feb 2011 08:45:47 +0000 (09:45 +0100)
commitf239d12a5cc4110ac4eec49c920deb76cc45c500
tree785ce29ec09904fbde73c63e3aeadaf6537752a5
parentc160eda713985d9065bd9497989fce593a3af40c
parent02c579b37c415054002b08a3ccfcaba1fa83bc2a
Merge branch 'x86/amd-nb' into x86/mm

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

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/smpboot.c