1 files changed, 17 insertions, 25 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 252972b6c4a0..4e41d5255d72 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -269,7 +269,6 @@ S:	Orphan
 F:      drivers/platform/x86/wmi.c
 
 AD1889 ALSA SOUND DRIVER
-M:      Kyle McMartin <kyle@mcmartin.ca>
 M:      Thibaut Varene <T-Bone@parisc-linux.org>
 W:      http://wiki.parisc-linux.org/AD1889
 L:      linux-parisc@vger.kernel.org
@@ -789,12 +788,6 @@ F:	arch/arm/mach-mx*/
 F:      arch/arm/mach-imx/
 F:      arch/arm/plat-mxc/
 
-ARM/FREESCALE IMX51
-M:      Amit Kucheria <amit.kucheria@canonical.com>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-F:      arch/arm/mach-mx5/
-
 ARM/FREESCALE IMX6
 M:      Shawn Guo <shawn.guo@linaro.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2287,7 +2280,7 @@ F:	drivers/acpi/dock.c
 DOCUMENTATION
 M:      Randy Dunlap <rdunlap@xenotime.net>
 L:      linux-doc@vger.kernel.org
-T:      quilt http://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/
+T:      quilt http://xenotime.net/kernel-doc-patches/current/
 S:      Maintained
 F:      Documentation/
 
@@ -3053,7 +3046,6 @@ F:	drivers/hwspinlock/hwspinlock_*
 F:      include/linux/hwspinlock.h
 
 HARMONY SOUND DRIVER
-M:      Kyle McMartin <kyle@mcmartin.ca>
 L:      linux-parisc@vger.kernel.org
 S:      Maintained
 F:      sound/parisc/harmony.*
@@ -3324,6 +3316,12 @@ S:	Maintained
 F:      net/ieee802154/
 F:      drivers/ieee802154/
 
+IIO SUBSYSTEM AND DRIVERS
+M:      Jonathan Cameron <jic23@cam.ac.uk>
+L:      linux-iio@vger.kernel.org
+S:      Maintained
+F:      drivers/staging/iio/
+
 IKANOS/ADI EAGLE ADSL USB DRIVER
 M:      Matthieu Castet <castet.matthieu@free.fr>
 M:      Stanislaw Gruszka <stf_xl@wp.pl>
@@ -3782,7 +3780,7 @@ F:	Documentation/kdump/
 
 KERNEL AUTOMOUNTER v4 (AUTOFS4)
 M:      Ian Kent <raven@themaw.net>
-L:      autofs@linux.kernel.org
+L:      autofs@vger.kernel.org
 S:      Maintained
 F:      fs/autofs4/
 
@@ -3992,11 +3990,11 @@ M:	Rusty Russell <rusty@rustcorp.com.au>
 L:      lguest@lists.ozlabs.org
 W:      http://lguest.ozlabs.org/
 S:      Odd Fixes
-F:      Documentation/virtual/lguest/
+F:      arch/x86/include/asm/lguest*.h
 F:      arch/x86/lguest/
 F:      drivers/lguest/
 F:      include/linux/lguest*.h
-F:      arch/x86/include/asm/lguest*.h
+F:      tools/lguest/
 
 LINUX FOR IBM pSERIES (RS/6000)
 M:      Paul Mackerras <paulus@au.ibm.com>
@@ -4136,7 +4134,7 @@ L:	linux-ntfs-dev@lists.sourceforge.net
 W:      http://www.linux-ntfs.org/content/view/19/37/
 S:      Maintained
 F:      Documentation/ldm.txt
-F:      fs/partitions/ldm.*
+F:      block/partitions/ldm.*
 
 LogFS
 M:      Joern Engel <joern@logfs.org>
@@ -4687,7 +4685,7 @@ NTFS FILESYSTEM
 M:      Anton Altaparmakov <anton@tuxera.com>
 L:      linux-ntfs-dev@lists.sourceforge.net
 W:      http://www.tuxera.com/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
 S:      Supported
 F:      Documentation/filesystems/ntfs.txt
 F:      fs/ntfs/
@@ -5000,9 +4998,8 @@ F:	Documentation/blockdev/paride.txt
 F:      drivers/block/paride/
 
 PARISC ARCHITECTURE
-M:      Kyle McMartin <kyle@mcmartin.ca>
-M:      Helge Deller <deller@gmx.de>
 M:      "James E.J. Bottomley" <jejb@parisc-linux.org>
+M:      Helge Deller <deller@gmx.de>
 L:      linux-parisc@vger.kernel.org
 W:      http://www.parisc-linux.org/
 Q:      http://patchwork.kernel.org/project/linux-parisc/list/
@@ -5633,7 +5630,7 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      arch/s390/
 F:      drivers/s390/
-F:      fs/partitions/ibm.c
+F:      block/partitions/ibm.c
 F:      Documentation/s390/
 F:      Documentation/DocBook/s390*
 
@@ -5861,7 +5858,7 @@ S:	Maintained
 F:      drivers/mmc/host/sdhci-spear.c
 
 SECURITY SUBSYSTEM
-M:      James Morris <jmorris@namei.org>
+M:      James Morris <james.l.morris@oracle.com>
 L:      linux-security-module@vger.kernel.org (suggested Cc:)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
 W:      http://security.wiki.kernel.org/
@@ -5874,7 +5871,7 @@ S:	Supported
 
 SELINUX SECURITY MODULE
 M:      Stephen Smalley <sds@tycho.nsa.gov>
-M:      James Morris <jmorris@namei.org>
+M:      James Morris <james.l.morris@oracle.com>
 M:      Eric Paris <eparis@parisplace.org>
 L:      selinux@tycho.nsa.gov (subscribers-only, general discussion)
 W:      http://selinuxproject.org
@@ -6396,11 +6393,6 @@ M:	Omar Ramirez Luna <omar.ramirez@ti.com>
 S:      Odd Fixes
 F:      drivers/staging/tidspbridge/
 
-STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS
-L:      linux-media@vger.kernel.org
-S:      Odd Fixes
-F:      drivers/staging/tm6000/
-
 STAGING - USB ENE SM/MS CARD READER DRIVER
 M:      Al Cho <acho@novell.com>
 S:      Odd Fixes
@@ -7279,7 +7271,7 @@ WATCHDOG DEVICE DRIVERS
 M:      Wim Van Sebroeck <wim@iguana.be>
 L:      linux-watchdog@vger.kernel.org
 W:      http://www.linux-watchdog.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
+T:      git git://www.linux-watchdog.org/linux-watchdog.git
 S:      Maintained
 F:      Documentation/watchdog/
 F:      drivers/watchdog/