Merge remote-tracking branch 'edac-amd/for-next'

Conflicts:
	arch/tile/Kconfig
	arch/x86/Kconfig