diff options
author | Olof Johansson <olof@lixom.net> | 2012-04-15 01:17:47 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-04-15 01:17:47 -0400 |
commit | 17d2f847e6aa1181024cb881fdc6cbad18f11b04 (patch) | |
tree | d6a1c35140a566a3b4bdf032b597cf96f5758e95 /MAINTAINERS | |
parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
parent | c65f2abf54a6d07260f1fa64773154e1d7047961 (diff) |
Merge branch 'ixp2xxx/removal' into next/cleanup
* ixp2xxx/removal:
ARM: remove ixp23xx and ixp2000 platforms
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2dcfca850639..ddf99c18f384 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -640,13 +640,6 @@ S: Maintained | |||
640 | F: drivers/amba/ | 640 | F: drivers/amba/ |
641 | F: include/linux/amba/bus.h | 641 | F: include/linux/amba/bus.h |
642 | 642 | ||
643 | ARM/ADI ROADRUNNER MACHINE SUPPORT | ||
644 | M: Lennert Buytenhek <kernel@wantstofly.org> | ||
645 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
646 | S: Maintained | ||
647 | F: arch/arm/mach-ixp23xx/ | ||
648 | F: arch/arm/mach-ixp23xx/include/mach/ | ||
649 | |||
650 | ARM/ADS SPHERE MACHINE SUPPORT | 643 | ARM/ADS SPHERE MACHINE SUPPORT |
651 | M: Lennert Buytenhek <kernel@wantstofly.org> | 644 | M: Lennert Buytenhek <kernel@wantstofly.org> |
652 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 645 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
@@ -859,21 +852,11 @@ M: Dan Williams <dan.j.williams@intel.com> | |||
859 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 852 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
860 | S: Maintained | 853 | S: Maintained |
861 | 854 | ||
862 | ARM/INTEL IXP2000 ARM ARCHITECTURE | ||
863 | M: Lennert Buytenhek <kernel@wantstofly.org> | ||
864 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
865 | S: Maintained | ||
866 | |||
867 | ARM/INTEL IXDP2850 MACHINE SUPPORT | 855 | ARM/INTEL IXDP2850 MACHINE SUPPORT |
868 | M: Lennert Buytenhek <kernel@wantstofly.org> | 856 | M: Lennert Buytenhek <kernel@wantstofly.org> |
869 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 857 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
870 | S: Maintained | 858 | S: Maintained |
871 | 859 | ||
872 | ARM/INTEL IXP23XX ARM ARCHITECTURE | ||
873 | M: Lennert Buytenhek <kernel@wantstofly.org> | ||
874 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
875 | S: Maintained | ||
876 | |||
877 | ARM/INTEL IXP4XX ARM ARCHITECTURE | 860 | ARM/INTEL IXP4XX ARM ARCHITECTURE |
878 | M: Imre Kaloz <kaloz@openwrt.org> | 861 | M: Imre Kaloz <kaloz@openwrt.org> |
879 | M: Krzysztof Halasa <khc@pm.waw.pl> | 862 | M: Krzysztof Halasa <khc@pm.waw.pl> |