Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c590a37..00ace1a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5802,6 +5802,12 @@ L:       linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/amd64_edac*
 
+EDAC-ARMADA
+M:     Jan Luebbe <jlu@pengutronix.de>
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     drivers/edac/armada_xp_*
+
 EDAC-AST2500
 M:     Stefan Schaeckeler <sschaeck@cisco.com>
 S:     Supported