diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2009-11-11 22:06:37 +0800 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-11-11 22:06:37 +0800 |
| commit | 9e29c044249edac62bf2809d46030bb1bcb6414f (patch) | |
| tree | e753c42049d2047c42e9dbf6be1808bdb8db4ad5 /MAINTAINERS | |
| parent | 9a237188c8879ae52e29d0c53f03a1bbe0243007 (diff) | |
| parent | 2dde9eeaaf78cbffb771baab9119e03f1047ac6c (diff) | |
Merge branch 'devel' into for-next
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a1a2aceca5bd..e3c0aca03ade 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> |