Merge branch 'x86/urgent' into x86/mm to pick up dependencies

diff --cc arch/x86/entry/entry_64.S
Simple merge

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

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc arch/x86/platform/intel-mid/intel-mid.c
Simple merge