aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Hałasa <khalasa@piap.pl>2014-09-30 04:32:58 -0400
committerArnd Bergmann <arnd@arndb.de>2014-10-02 10:41:05 -0400
commit5529c2cdfd87e64c5801bfb9788a89d78de03414 (patch)
treeb7e781c7ed9125f52dd256ded4b29cb878442ef8
parente54951c8585e8e950ac04b15728910cc5a64e612 (diff)
MAINTAINERS: CNS3xxx and IXP4xx update.
I'm told Anton Vorontsov can't maintain Cavium Econa CNS3xxx support anymore. Perhaps I can. Also changing my email contact address for IXP4xx. Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--MAINTAINERS7
1 files changed, 3 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4fe9320388e7..f04c8b672622 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -867,10 +867,9 @@ S: Maintained
867F: arch/arm/mach-highbank/ 867F: arch/arm/mach-highbank/
868 868
869ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT 869ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
870M: Anton Vorontsov <anton@enomsg.org> 870M: Krzysztof Halasa <khalasa@piap.pl>
871S: Maintained 871S: Maintained
872F: arch/arm/mach-cns3xxx/ 872F: arch/arm/mach-cns3xxx/
873T: git git://git.infradead.org/users/cbou/linux-cns3xxx.git
874 873
875ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE 874ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
876M: Alexander Shiyan <shc_work@mail.ru> 875M: Alexander Shiyan <shc_work@mail.ru>
@@ -1059,7 +1058,7 @@ S: Maintained
1059 1058
1060ARM/INTEL IXP4XX ARM ARCHITECTURE 1059ARM/INTEL IXP4XX ARM ARCHITECTURE
1061M: Imre Kaloz <kaloz@openwrt.org> 1060M: Imre Kaloz <kaloz@openwrt.org>
1062M: Krzysztof Halasa <khc@pm.waw.pl> 1061M: Krzysztof Halasa <khalasa@piap.pl>
1063L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1062L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1064S: Maintained 1063S: Maintained
1065F: arch/arm/mach-ixp4xx/ 1064F: arch/arm/mach-ixp4xx/
@@ -4787,7 +4786,7 @@ S: Odd fixes
4787F: drivers/dma/iop-adma.c 4786F: drivers/dma/iop-adma.c
4788 4787
4789INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT 4788INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
4790M: Krzysztof Halasa <khc@pm.waw.pl> 4789M: Krzysztof Halasa <khalasa@piap.pl>
4791S: Maintained 4790S: Maintained
4792F: arch/arm/mach-ixp4xx/include/mach/qmgr.h 4791F: arch/arm/mach-ixp4xx/include/mach/qmgr.h
4793F: arch/arm/mach-ixp4xx/include/mach/npe.h 4792F: arch/arm/mach-ixp4xx/include/mach/npe.h