From 883ca0bb055db0f0ca5ca5854ca9a4d374e0fd60 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Fri, 9 Dec 2011 09:58:41 +0800 Subject: [PATCH] --- yaml --- r: 281499 b: refs/heads/master c: 3f640c61f582e8e770d9930c5ae1bb717b24f830 h: refs/heads/master i: 281497: 798f722ea465b3cec0f30e756d66823d80661237 281495: bbe7be9d8fe500889c612fd534fb94c7599cdde6 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 22 +++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 8048da486cbd..4937ece25d22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61cbaa928705eaeabefb8a5264bc22b4ca909f6b +refs/heads/master: 3f640c61f582e8e770d9930c5ae1bb717b24f830 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index b9db108f01c8..a61a0d1a0b4d 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5302,7 +5302,10 @@ F: drivers/media/video/pvrusb2/ PXA2xx/PXA3xx SUPPORT M: Eric Miao M: Russell King +M: Haojian Zhuang 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 -M: Jason Chagas -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 -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 -M: Eric Miao 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