summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 17:34:16 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-04 17:34:16 +0000
commit4567c4a89693416ccca02d32109bce967e9c1ade (patch)
tree9d77cf02ce269ed5fc4b6e2ebddb9ad7fd504ad1 /MAINTAINERS
parent602fd7c36728a04e61a442c9755e7d454501266c (diff)
parent19d6c13b56a78b3757e747f469285c2a546d634a (diff)
downloadop-kernel-dev-4567c4a89693416ccca02d32109bce967e9c1ade.zip
op-kernel-dev-4567c4a89693416ccca02d32109bce967e9c1ade.tar.gz
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS13
1 files changed, 13 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c824b4d..54f7d4a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -707,6 +707,19 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: arch/arm/mach-ixp4xx/
+ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT
+M: Jonathan Cameron <jic23@cam.ac.uk>
+L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S: Maintained
+F: arch/arm/mach-pxa/imote2.c
+
+ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT
+M: Jonathan Cameron <jic23@cam.ac.uk>
+L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S: Maintained
+F: arch/arm/mach-pxa/stargate2.c
+F: drivers/pcmcia/pxa2xx_stargate2.c
+
ARM/INTEL XSC3 (MANZANO) ARM CORE
M: Lennert Buytenhek <kernel@wantstofly.org>
M: Dan Williams <dan.j.williams@intel.com>
OpenPOWER on IntegriCloud