Merge branches 'edac-i10nm' and 'edac-misc' into edac-updates-for-5.8
authorBorislav Petkov <bp@suse.de>
Mon, 1 Jun 2020 09:39:15 +0000 (11:39 +0200)
committerBorislav Petkov <bp@suse.de>
Mon, 1 Jun 2020 09:39:15 +0000 (11:39 +0200)
commit2a02ca0428cfe68cce600111acb4c6f7d85cf71f
treea982ecace5e37cc8528e1bfe4c57a29dea5a4c3e
parent3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162
parentce20670828c1228ecd37befbdda87a1f87a803b9
parentf00eb5ff2f6ffc4a2f0fc0e829410082bff0f78e
Merge branches 'edac-i10nm' and 'edac-misc' into edac-updates-for-5.8

Signed-off-by: Borislav Petkov <bp@suse.de>
MAINTAINERS
drivers/edac/i10nm_base.c
drivers/edac/skx_base.c
drivers/edac/skx_common.c
drivers/edac/skx_common.h