From: Eric Miao <eric.y.miao@gmail.com>
Date: Thu, 12 Jun 2008 22:21:41 +0000 (-0700)
Subject: MAINTAINERS: update maintainership of pxa2xx/pxa3xx
X-Git-Tag: v2.6.26-rc7~56
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30ec261e5f97986644c0982543bc1cee1b2782bf;p=linux-2.6

MAINTAINERS: update maintainership of pxa2xx/pxa3xx

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Acked-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/MAINTAINERS b/MAINTAINERS
index 9187bb0142..88aac5f81e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3330,9 +3330,11 @@ L:	video4linux-list@redhat.com
 W:	http://www.isely.net/pvrusb2/
 S:	Maintained
 
-PXA2xx SUPPORT
-P:	Nicolas Pitre
-M:	nico@cam.org
+PXA2xx/PXA3xx SUPPORT
+P:	Eric Miao
+M:	eric.miao@marvell.com
+P:	Russell King
+M:	linux@arm.linux.org.uk
 L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
 S:	Maintained