diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 13:35:33 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 13:35:33 +0300 |
| commit | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch) | |
| tree | 794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /MAINTAINERS | |
| parent | e28edb723e64200554194da17617ee6e82de6690 (diff) | |
| parent | 677f4f64e4b2336682f0e15c69b206ade6f6b131 (diff) | |
| download | linux-0719dc341389882cc834ed18fc9b7fc6006b2b85.tar.xz | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6150c80bccf6..ad59f178586f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -659,6 +659,9 @@ ARM/FREESCALE IMX / MXC ARM ARCHITECTURE M: Sascha Hauer <kernel@pengutronix.de> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained +T: git://git.pengutronix.de/git/imx/linux-2.6.git +F: arch/arm/mach-mx*/ +F: arch/arm/plat-mxc/ ARM/GLOMATION GESBC9312SX MACHINE SUPPORT M: Lennert Buytenhek <kernel@wantstofly.org> @@ -729,6 +732,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> |