diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:29:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:29:32 -0500 |
| commit | b93a4afcff7be859e30cad2a305731516057d6cf (patch) | |
| tree | fb5fe55864e16527e453efd18790a34db22ee2a1 /MAINTAINERS | |
| parent | 62c132a8008991530839401674ce8e1b12b005d3 (diff) | |
| parent | 9b1489e989695c4d502865f8bec616c0f17e99ab (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index de44fb6ef620..c16cce63b8ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -662,6 +662,12 @@ T: git://git.pengutronix.de/git/imx/linux-2.6.git | |||
| 662 | F: arch/arm/mach-mx*/ | 662 | F: arch/arm/mach-mx*/ |
| 663 | F: arch/arm/plat-mxc/ | 663 | F: arch/arm/plat-mxc/ |
| 664 | 664 | ||
| 665 | ARM/FREESCALE IMX51 | ||
| 666 | M: Amit Kucheria <amit.kucheria@canonical.com> | ||
| 667 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
| 668 | S: Maintained | ||
| 669 | F: arch/arm/mach-mx5/ | ||
| 670 | |||
| 665 | ARM/GLOMATION GESBC9312SX MACHINE SUPPORT | 671 | ARM/GLOMATION GESBC9312SX MACHINE SUPPORT |
| 666 | M: Lennert Buytenhek <kernel@wantstofly.org> | 672 | M: Lennert Buytenhek <kernel@wantstofly.org> |
| 667 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 673 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |