diff options
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 | |||
867 | F: arch/arm/mach-highbank/ | 867 | F: arch/arm/mach-highbank/ |
868 | 868 | ||
869 | ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT | 869 | ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT |
870 | M: Anton Vorontsov <anton@enomsg.org> | 870 | M: Krzysztof Halasa <khalasa@piap.pl> |
871 | S: Maintained | 871 | S: Maintained |
872 | F: arch/arm/mach-cns3xxx/ | 872 | F: arch/arm/mach-cns3xxx/ |
873 | T: git git://git.infradead.org/users/cbou/linux-cns3xxx.git | ||
874 | 873 | ||
875 | ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE | 874 | ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE |
876 | M: Alexander Shiyan <shc_work@mail.ru> | 875 | M: Alexander Shiyan <shc_work@mail.ru> |
@@ -1059,7 +1058,7 @@ S: Maintained | |||
1059 | 1058 | ||
1060 | ARM/INTEL IXP4XX ARM ARCHITECTURE | 1059 | ARM/INTEL IXP4XX ARM ARCHITECTURE |
1061 | M: Imre Kaloz <kaloz@openwrt.org> | 1060 | M: Imre Kaloz <kaloz@openwrt.org> |
1062 | M: Krzysztof Halasa <khc@pm.waw.pl> | 1061 | M: Krzysztof Halasa <khalasa@piap.pl> |
1063 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 1062 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
1064 | S: Maintained | 1063 | S: Maintained |
1065 | F: arch/arm/mach-ixp4xx/ | 1064 | F: arch/arm/mach-ixp4xx/ |
@@ -4787,7 +4786,7 @@ S: Odd fixes | |||
4787 | F: drivers/dma/iop-adma.c | 4786 | F: drivers/dma/iop-adma.c |
4788 | 4787 | ||
4789 | INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT | 4788 | INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT |
4790 | M: Krzysztof Halasa <khc@pm.waw.pl> | 4789 | M: Krzysztof Halasa <khalasa@piap.pl> |
4791 | S: Maintained | 4790 | S: Maintained |
4792 | F: arch/arm/mach-ixp4xx/include/mach/qmgr.h | 4791 | F: arch/arm/mach-ixp4xx/include/mach/qmgr.h |
4793 | F: arch/arm/mach-ixp4xx/include/mach/npe.h | 4792 | F: arch/arm/mach-ixp4xx/include/mach/npe.h |