diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-12-09 09:58:41 +0800 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 10:30:46 +0000 |
| commit | 3f640c61f582e8e770d9930c5ae1bb717b24f830 (patch) | |
| tree | a77888ec044aa1713fff2f87e1ba236255ad8904 /MAINTAINERS | |
| parent | 61cbaa928705eaeabefb8a5264bc22b4ca909f6b (diff) | |
| download | linux-3f640c61f582e8e770d9930c5ae1bb717b24f830.tar.bz2 | |
MAINTAINERS: update pxa and mmp
Merge PXA168, PXXA910 and MMP2 together. Add Haojian as maintainer of
both arch-pxa and arch-mmp. Haojian's git tree is also added.
Update Eric's tree since the original one is obsolte.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b9db108f01c8..a61a0d1a0b4d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5302,7 +5302,10 @@ F: drivers/media/video/pvrusb2/ PXA2xx/PXA3xx SUPPORT M: Eric Miao <eric.y.miao@gmail.com> M: Russell King <linux@arm.linux.org.uk> +M: Haojian Zhuang <haojian.zhuang@marvell.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +T: git git://github.com/hzhuang1/linux.git +T: git git://git.linaro.org/people/ycmiao/pxa-linux.git S: Maintained F: arch/arm/mach-pxa/ F: drivers/pcmcia/pxa2xx* @@ -5312,25 +5315,14 @@ F: include/sound/pxa2xx-lib.h F: sound/arm/pxa* F: sound/soc/pxa -PXA168 SUPPORT -M: Eric Miao <eric.y.miao@gmail.com> -M: Jason Chagas <jason.chagas@marvell.com> -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git -S: Maintained - -PXA910 SUPPORT +MMP SUPPORT M: Eric Miao <eric.y.miao@gmail.com> -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git -S: Maintained - -MMP2 SUPPORT (aka ARMADA610) M: Haojian Zhuang <haojian.zhuang@marvell.com> -M: Eric Miao <eric.y.miao@gmail.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git +T: git git://github.com/hzhuang1/linux.git +T: git git://git.linaro.org/people/ycmiao/pxa-linux.git S: Maintained +F: arch/arm/mach-mmp/ PXA MMCI DRIVER S: Orphan |