summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorEric Miao <eric.y.miao@gmail.com>2008-06-12 15:21:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-12 18:05:41 -0700
commit30ec261e5f97986644c0982543bc1cee1b2782bf (patch)
tree6616ee203f99d702826c72109d83dc1eaa561c9c /MAINTAINERS
parentf1ef9167ca4494a8c6d71d0031c73e9c8841eadd (diff)
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>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9187bb01426..88aac5f81e2 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