Merge branch 'x86/core' into x86/mce2
commit638bee71c83a2837b48062fdc5b222163cf53d79
authorH. Peter Anvin <hpa@zytor.com>
Wed, 25 Feb 2009 00:11:51 +0000 (24 16:11 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 25 Feb 2009 00:11:51 +0000 (24 16:11 -0800)
tree9c1699c07a5aa547d769138317279b8ee1ba89e8
parent2aaa822984b97efd894d10d1e1382206ef0291a7
parenta852cbfaaf8122827602027b1614971cfd832304
Merge branch 'x86/core' into x86/mce2
arch/x86/Kconfig
arch/x86/configs/i386_defconfig
arch/x86/configs/x86_64_defconfig
arch/x86/kernel/apic/apic.c
arch/x86/kernel/cpu/mcheck/mce_amd_64.c
arch/x86/kernel/cpu/mcheck/mce_intel_64.c