Merge commit 'v2.6.27-rc6' into x86/unify-cpu-detect
authorIngo Molnar <mingo@elte.hu>
Wed, 10 Sep 2008 12:00:45 +0000 (14:00 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 10 Sep 2008 12:00:45 +0000 (14:00 +0200)
commit59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1
tree2ffc3f2ce655806424d022f3a4daec7665ab888f
parentec70cae8698632917f06110fdb70c6364281ecc6
parentadee14b2e1557d0a8559f29681732d05a89dfc35
Merge commit 'v2.6.27-rc6' into x86/unify-cpu-detect

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>
arch/x86/Kconfig.cpu
arch/x86/kernel/e820.c
arch/x86/xen/enlighten.c