Merge commit 'v2.6.27-rc6' into x86/unify-cpu-detect
Ingo Molnar [Wed, 10 Sep 2008 12:00:45 +0000 (14:00 +0200)]
Conflicts:
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h

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

1  2 
arch/x86/Kconfig.cpu
arch/x86/kernel/e820.c
arch/x86/xen/enlighten.c

Simple merge
Simple merge
Simple merge