Merge tag 'edac_for_4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2811a211632c38226b72705cefc186466f607b3e..48d8f05bf92b337e24a7524f418350dbba96ad52 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4234,7 +4234,7 @@ S:        Maintained
 F:     drivers/dma/
 F:     include/linux/dmaengine.h
 F:     Documentation/devicetree/bindings/dma/
-F:     Documentation/dmaengine/
+F:     Documentation/driver-api/dmaengine/
 T:     git git://git.infradead.org/users/vkoul/slave-dma.git
 
 DMA MAPPING HELPERS
@@ -4906,13 +4906,19 @@ L:      linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/highbank*
 
-EDAC-CAVIUM
+EDAC-CAVIUM OCTEON
 M:     Ralf Baechle <ralf@linux-mips.org>
 M:     David Daney <david.daney@cavium.com>
 L:     linux-edac@vger.kernel.org
 L:     linux-mips@linux-mips.org
 S:     Supported
 F:     drivers/edac/octeon_edac*
+
+EDAC-CAVIUM THUNDERX
+M:     David Daney <david.daney@cavium.com>
+M:     Jan Glauber <jglauber@cavium.com>
+L:     linux-edac@vger.kernel.org
+S:     Supported
 F:     drivers/edac/thunderx_edac*
 
 EDAC-CORE