Merge remote-tracking branch 'edac/linux_next'

diff --cc drivers/edac/edac_mc.c
Simple merge

diff --cc drivers/edac/edac_pci_sysfs.c
Simple merge

diff --cc drivers/edac/i7core_edac.c
Simple merge

diff --cc drivers/edac/sb_edac.c
Simple merge