Merge branch 'master' into for-linus

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6d119c98b89bfe8bc55da0594243153280f1c005..c92dd6663f8aa612a0e3d5bf6ae8e82f96a95c10 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5569,6 +5569,12 @@ F:       include/linux/tipc*.h
 F:     include/net/tipc/
 F:     net/tipc/
 
+TILE ARCHITECTURE
+M:     Chris Metcalf <cmetcalf@tilera.com>
+W:     http://www.tilera.com/scm/
+S:     Supported
+F:     arch/tile/
+
 TLAN NETWORK DRIVER
 M:     Samuel Chessman <chessman@tux.org>
 L:     tlan-devel@lists.sourceforge.net (subscribers-only)