diff --git a/[refs] b/[refs] index 8ca1c955d5cd..bb45a738bf23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 220e6cf7b793d702596506a8c4bf1f4fd4040df1 +refs/heads/master: 986cf2e91968759af4268160348d8f31726525e8 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index ace8f9c81b96..89a346827fef 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -688,6 +688,12 @@ F: drivers/mtd/nand/bcm_umi_nand.c F: drivers/mtd/nand/bcm_umi_bch.c F: drivers/mtd/nand/nand_bcm_umi.h +ARM/CALXEDA HIGHBANK ARCHITECTURE +M: Rob Herring +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: arch/arm/mach-highbank/ + ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT M: Anton Vorontsov S: Maintained