---

yaml
---
r: 149375
b: refs/heads/master
c: 7517b3f
h: refs/heads/master
i:
  149373: 7cf4eb0
  149371: f28c97b
  149367: aec72b9
  149359: 03d3704
  149343: c8da4ea
  149311: aa65c7e
  149247: 234735a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 638772c7553f6893f7b346bfee4d46851af59afc
+refs/heads/master: 7517b3fbe40c231d79d36f31c1e9930cbb8c4be2

trunk/MAINTAINERS

@@ -4571,7 +4571,7 @@ F:	drivers/media/video/pvrusb2/
 
 PXA2xx/PXA3xx SUPPORT
 P:	Eric Miao
-M:	eric.miao@marvell.com
+M:	eric.y.miao@gmail.com
 P:	Russell King
 M:	linux@arm.linux.org.uk
 L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
@@ -4585,19 +4585,19 @@ F:	sound/soc/pxa/pxa2xx*
 
 PXA168 SUPPORT
 P:	Eric Miao
-M:	eric.miao@marvell.com
+M:	eric.y.miao@gmail.com
 P:	Jason Chagas
 M:	jason.chagas@marvell.com
 L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
-S:	Supported
+S:	Maintained
 
 PXA910 SUPPORT
 P:	Eric Miao
-M:	eric.miao@marvell.com
+M:	eric.y.miao@gmail.com
 L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
-S:	Supported
+S:	Maintained
 
 PXA MMCI DRIVER
 S:	Orphan