Merge tag 'for-linus-20121009' of git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3f1131b..eae3cd8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7178,6 +7178,8 @@ F:        drivers/char/tlclk.c
 
 TENSILICA XTENSA PORT (xtensa)
 M:     Chris Zankel <chris@zankel.net>
+M:     Max Filippov <jcmvbkbc@gmail.com>
+L:     linux-xtensa@linux-xtensa.org
 S:     Maintained
 F:     arch/xtensa/