diff options
author | Joe Perches <joe@perches.com> | 2010-10-26 17:22:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 19:52:17 -0400 |
commit | 838553c5a151f0d76c5558b85d6a4131c835a20c (patch) | |
tree | cd9aaa91e88313342806266d3cff09f69454ea47 /MAINTAINERS | |
parent | ec15408206e6b87a11dc1560b2bd758d2ad7ccb1 (diff) |
MAINTAINERS: merge imote2 and stargate
Removed by commit dcd925f95194da4 ("pxa: merge stargate2 and imote2 board
files").
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a8d1f5686cee..5bb0f896bc24 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -757,13 +757,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | |||
757 | S: Maintained | 757 | S: Maintained |
758 | F: arch/arm/mach-ixp4xx/ | 758 | F: arch/arm/mach-ixp4xx/ |
759 | 759 | ||
760 | ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT | 760 | ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT |
761 | M: Jonathan Cameron <jic23@cam.ac.uk> | ||
762 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
763 | S: Maintained | ||
764 | F: arch/arm/mach-pxa/imote2.c | ||
765 | |||
766 | ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT | ||
767 | M: Jonathan Cameron <jic23@cam.ac.uk> | 761 | M: Jonathan Cameron <jic23@cam.ac.uk> |
768 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 762 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
769 | S: Maintained | 763 | S: Maintained |