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

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 13 Sep 2016 02:02:31 +0000 (12:02 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 13 Sep 2016 02:02:31 +0000 (12:02 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 02:02:31 +0000 (12:02 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 02:02:31 +0000 (12:02 +1000)
diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm64/Kconfig.platforms
Simple merge
diff --cc drivers/edac/Kconfig
Simple merge
diff --cc drivers/edac/Makefile
Simple merge
diff --cc drivers/edac/sb_edac.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2016 02:02:31 +0000 (12:02 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2016 02:02:31 +0000 (12:02 +1000)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig.platforms	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/edac/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/edac/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/edac/sb_edac.c	patch \|	diff1 \|	diff2 \|	blob \| history