Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/ps3: Update ps3_defconfig
  powerpc/ps3: Update platform maintainer
  powerpc/pseries: Flush lazy kernel mappings after unplug operations
  powerpc/numa: Add form 1 NUMA affinity
  powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32
  powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx
  powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED
  powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig
  powerpc/83xx: enable EPOLL syscall in defconfig
  powerpc/83xx: add RTC drivers in 83xx defconfig
  powerpc/fsl-cpm: Configure clock correctly for SCC
  powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS
  powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n

1 files changed, 4 insertions, 4 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 183887518fe3..d5b0b1b6dc52 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4482,17 +4482,17 @@ S:	Maintained
 F:      drivers/ata/sata_promise.*
 
 PS3 NETWORK SUPPORT
-M:      Geoff Levand <geoffrey.levand@am.sony.com>
+M:      Geoff Levand <geoff@infradead.org>
 L:      netdev@vger.kernel.org
 L:      cbe-oss-dev@ozlabs.org
-S:      Supported
+S:      Maintained
 F:      drivers/net/ps3_gelic_net.*
 
 PS3 PLATFORM SUPPORT
-M:      Geoff Levand <geoffrey.levand@am.sony.com>
+M:      Geoff Levand <geoff@infradead.org>
 L:      linuxppc-dev@ozlabs.org
 L:      cbe-oss-dev@ozlabs.org
-S:      Supported
+S:      Maintained
 F:      arch/powerpc/boot/ps3*
 F:      arch/powerpc/include/asm/lv1call.h
 F:      arch/powerpc/include/asm/ps3*.h