diff options
author | Krzysztof Hałasa <khalasa@piap.pl> | 2014-09-30 10:32:58 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-10-02 16:41:05 +0200 |
commit | 5529c2cdfd87e64c5801bfb9788a89d78de03414 (patch) | |
tree | b7e781c7ed9125f52dd256ded4b29cb878442ef8 /MAINTAINERS | |
parent | e54951c8585e8e950ac04b15728910cc5a64e612 (diff) | |
download | linux-5529c2cdfd87e64c5801bfb9788a89d78de03414.tar.bz2 |
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>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
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 F: arch/arm/mach-highbank/ ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT -M: Anton Vorontsov <anton@enomsg.org> +M: Krzysztof Halasa <khalasa@piap.pl> S: Maintained F: arch/arm/mach-cns3xxx/ -T: git git://git.infradead.org/users/cbou/linux-cns3xxx.git ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE M: Alexander Shiyan <shc_work@mail.ru> @@ -1059,7 +1058,7 @@ S: Maintained ARM/INTEL IXP4XX ARM ARCHITECTURE M: Imre Kaloz <kaloz@openwrt.org> -M: Krzysztof Halasa <khc@pm.waw.pl> +M: Krzysztof Halasa <khalasa@piap.pl> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-ixp4xx/ @@ -4787,7 +4786,7 @@ S: Odd fixes F: drivers/dma/iop-adma.c INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT -M: Krzysztof Halasa <khc@pm.waw.pl> +M: Krzysztof Halasa <khalasa@piap.pl> S: Maintained F: arch/arm/mach-ixp4xx/include/mach/qmgr.h F: arch/arm/mach-ixp4xx/include/mach/npe.h |