Merge branch 'x86/mce'

diff --cc arch/x86/kernel/amd_nb.c
Simple merge

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

diff --cc include/linux/pci_ids.h
Simple merge