diff --git a/[refs] b/[refs]
index 3412b16ef4e3..b009dc56e1a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1ef9167ca4494a8c6d71d0031c73e9c8841eadd
+refs/heads/master: 30ec261e5f97986644c0982543bc1cee1b2782bf
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 9187bb014266..88aac5f81e23 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/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