diff --git a/[refs] b/[refs] index 5d6c41faf7f6..95592f2c1b66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 649508f684751122aa302ab10f0f06cb4a88415b +refs/heads/master: 1228594528faf432ddc3eb51bccaf6a0d80bfc27 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 3b955649c325..401145d7c5bb 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5033,6 +5033,13 @@ F: drivers/mtd/ F: include/linux/mtd/ F: include/uapi/mtd/ +METAG ARCHITECTURE +M: James Hogan +S: Supported +F: arch/metag/ +F: Documentation/metag/ +F: Documentation/devicetree/bindings/metag/ + MICROBLAZE ARCHITECTURE M: Michal Simek L: microblaze-uclinux@itee.uq.edu.au (moderated for non-subscribers)