Merge branch 'x86/urgent' into x86/mce2

diff --cc arch/x86/kernel/cpu/mcheck/mce_64.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce_amd_64.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce_intel_64.c
Simple merge