Merge tag 'edac_for_5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
[sfrench/cifs-2.6.git] / MAINTAINERS
index 275e9bb5b7221f34a3a8e358e0442f87b20226cd..f758445317c5c909bfb52ad23a2f1f1810bdaec2 100644 (file)
@@ -5503,6 +5503,12 @@ L:       linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/amd64_edac*
 
+EDAC-AST2500
+M:     Stefan Schaeckeler <sschaeck@cisco.com>
+S:     Supported
+F:     drivers/edac/aspeed_edac.c
+F:     Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
+
 EDAC-CALXEDA
 M:     Robert Richter <rric@kernel.org>
 L:     linux-edac@vger.kernel.org
@@ -5527,6 +5533,7 @@ F:        drivers/edac/thunderx_edac*
 EDAC-CORE
 M:     Borislav Petkov <bp@alien8.de>
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
+R:     James Morse <james.morse@arm.com>
 L:     linux-edac@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next