Merge branch 'fixes-non-critical' of git://github.com/hzhuang1/linux into next/maintainers

* 'fixes-non-critical' of git://github.com/hzhuang1/linux:
  MAINTAINERS: update MAINTAINERS email entry
  MAINTAINERS: update maintainer entry for pxa/hx4700

(update to v3.3-rc7)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 8 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8758b0df5012..187d855c7a1a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -813,9 +813,12 @@ S:	Maintained
 
 ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
 M:      Philipp Zabel <philipp.zabel@gmail.com>
+M:      Paul Parsons <lost.distance@yahoo.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-pxa/hx4700.c
 F:      arch/arm/mach-pxa/include/mach/hx4700.h
+F:      sound/soc/pxa/hx4700.c
 
 ARM/HP JORNADA 7XX MACHINE SUPPORT
 M:      Kristoffer Ericson <kristoffer.ericson@gmail.com>
@@ -961,7 +964,7 @@ F:	drivers/tty/serial/msm_serial.c
 F:      drivers/platform/msm/
 F:      drivers/*/pm8???-*
 F:      include/linux/mfd/pm8xxx/
-T:      git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
 S:      Maintained
 
 ARM/TOSA MACHINE SUPPORT
@@ -1309,7 +1312,7 @@ F:	drivers/atm/
 F:      include/linux/atm*
 
 ATMEL AT91 MCI DRIVER
-M:      Nicolas Ferre <nicolas.ferre@atmel.com>
+M:      Ludovic Desroches <ludovic.desroches@atmel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.atmel.com/products/AT91/
 W:      http://www.at91.com/
@@ -1317,7 +1320,7 @@ S:	Maintained
 F:      drivers/mmc/host/at91_mci.c
 
 ATMEL AT91 / AT32 MCI DRIVER
-M:      Nicolas Ferre <nicolas.ferre@atmel.com>
+M:      Ludovic Desroches <ludovic.desroches@atmel.com>
 S:      Maintained
 F:      drivers/mmc/host/atmel-mci.c
 F:      drivers/mmc/host/atmel-mci-regs.h
@@ -5340,7 +5343,7 @@ F:	drivers/media/video/pvrusb2/
 PXA2xx/PXA3xx SUPPORT
 M:      Eric Miao <eric.y.miao@gmail.com>
 M:      Russell King <linux@arm.linux.org.uk>
-M:      Haojian Zhuang <haojian.zhuang@marvell.com>
+M:      Haojian Zhuang <haojian.zhuang@gmail.com>
 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
@@ -5355,7 +5358,7 @@ F:	sound/soc/pxa
 
 MMP SUPPORT
 M:      Eric Miao <eric.y.miao@gmail.com>
-M:      Haojian Zhuang <haojian.zhuang@marvell.com>
+M:      Haojian Zhuang <haojian.zhuang@gmail.com>
 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