Merge branches 'edac-i10nm' and 'edac-misc' into edac-updates-for-5.8

Signed-off-by: Borislav Petkov <bp@suse.de>

diff --cc MAINTAINERS
Simple merge

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

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

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

diff --cc drivers/edac/skx_common.h
Simple merge