diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 11:46:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 11:46:24 +1100 |
| commit | 643279db73eed6aec07d1ac577123d14a7d21710 (patch) | |
| tree | fd73065573b19ebb3344be23416c92a3663f68f3 /MAINTAINERS | |
| parent | f010a8bc587786b30e8c3ca4f0f5afb4792838e8 (diff) | |
| parent | b0bd7b56ff4a0672d11751e4f20505d1cad1e132 (diff) | |
Merge remote branch 'pxa/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 e9fcac2cf1a8..2a31ad2576b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -729,6 +729,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> |