1 files changed, 25 insertions, 15 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 3d29fa389888..d5b0b1b6dc52 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -485,8 +485,8 @@ S:	Maintained
 F:      drivers/input/mouse/bcm5974.c
 
 APPLE SMC DRIVER
-M:      Nicolas Boichat <nicolas@boichat.ch>
-L:      mactel-linux-devel@lists.sourceforge.net
+M:      Henrik Rydberg <rydberg@euromail.se>
+L:      lm-sensors@lm-sensors.org
 S:      Maintained
 F:      drivers/hwmon/applesmc.c
 
@@ -971,6 +971,16 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.mcuos.com
 S:      Maintained
 
+ARM/U300 MACHINE SUPPORT
+M:      Linus Walleij <linus.walleij@stericsson.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Supported
+F:      arch/arm/mach-u300/
+F:      drivers/i2c/busses/i2c-stu300.c
+F:      drivers/rtc/rtc-coh901331.c
+F:      drivers/watchdog/coh901327_wdt.c
+F:      drivers/dma/coh901318*
+
 ARM/U8500 ARM ARCHITECTURE
 M:      Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1950,7 +1960,7 @@ F:	lib/kobj*
 
 DRM DRIVERS
 M:      David Airlie <airlied@linux.ie>
-L:      dri-devel@lists.sourceforge.net
+L:      dri-devel@lists.freedesktop.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 S:      Maintained
 F:      drivers/gpu/drm/
@@ -2474,12 +2484,6 @@ L:	linuxppc-dev@ozlabs.org
 S:      Odd Fixes
 F:      drivers/char/hvc_*
 
-VIRTIO CONSOLE DRIVER
-M:      Amit Shah <amit.shah@redhat.com>
-L:      virtualization@lists.linux-foundation.org
-S:      Maintained
-F:      drivers/char/virtio_console.c
-
 iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 M:      Peter Jones <pjones@redhat.com>
 M:      Konrad Rzeszutek Wilk <konrad@kernel.org>
@@ -4478,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
@@ -4787,12 +4791,11 @@ F:	drivers/s390/crypto/
 
 S390 ZFCP DRIVER
 M:      Christof Schmitt <christof.schmitt@de.ibm.com>
-M:      Martin Peschke <mp3@de.ibm.com>
+M:      Swen Schillig <swen@vnet.ibm.com>
 M:      linux390@de.ibm.com
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
-F:      Documentation/s390/zfcpdump.txt
 F:      drivers/s390/scsi/zfcp_*
 
 S390 IUCV NETWORK LAYER
@@ -5971,6 +5974,13 @@ S:	Maintained
 F:      Documentation/filesystems/vfat.txt
 F:      fs/fat/
 
+VIRTIO CONSOLE DRIVER
+M:      Amit Shah <amit.shah@redhat.com>
+L:      virtualization@lists.linux-foundation.org
+S:      Maintained
+F:      drivers/char/virtio_console.c
+F:      include/linux/virtio_console.h
+
 VIRTIO HOST (VHOST)
 M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:      kvm@vger.kernel.org