-
git://git.kernel.org/pub/scm/linux/kernel/git/tj/miscIngo Molnar authored
Conflicts: arch/x86/kernel/setup_percpu.c Semantic conflict: arch/x86/kernel/cpu/common.c Signed-off-by:Ingo Molnar <mingo@elte.hu>
4369f1fb
Conflicts:
arch/x86/kernel/setup_percpu.c
Semantic conflict:
arch/x86/kernel/cpu/common.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>