1 files changed, 30 insertions, 15 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 0fdb8a50b921..10deabeb3929 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -297,6 +297,12 @@ P:	Colin Leroy
 M:      colin@colino.net
 S:      Maintained
 
+ADVANSYS SCSI DRIVER
+P:      Matthew Wilcox
+M:      matthew@wil.cx
+L:      linux-scsi@vger.kernel.org
+S:      Maintained
+
 AEDSP16 DRIVER
 P:      Riccardo Facchetti
 M:      fizban@tin.it
@@ -1660,7 +1666,8 @@ P:	Mark M. Hoffman
 M:      mhoffman@lightlink.com
 L:      lm-sensors@lm-sensors.org
 W:      http://www.lm-sensors.org/
-T:      git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git
+T:      git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git testing
+T:      git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git release
 S:      Maintained
 
 HARDWARE RANDOM NUMBER GENERATOR CORE
@@ -1762,7 +1769,7 @@ S:	Maintained
 
 HP100:  Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
 P:      Jaroslav Kysela
-M:      perex@suse.cz
+M:      perex@perex.cz
 S:      Maintained
 
 HPET:   High Precision Event Timers driver (hpet.c)
@@ -1870,10 +1877,8 @@ T:	quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
 S:      Maintained
 
 IDE/ATAPI CDROM DRIVER
-P:      Alan Cox
-M:      alan@lxorguk.ukuu.org.uk
 L:      linux-ide@vger.kernel.org
-S:      Maintained
+S:      Unmaintained
 
 IDE/ATAPI FLOPPY DRIVERS
 P:      Paul Bristow
@@ -1888,6 +1893,11 @@ M:	Gadi Oxman <gadio@netvision.net.il>
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+IDE-SCSI DRIVER
+L:      linux-ide@vger.kernel.org
+L:      linux-scsi@vger.kernel.org
+S:      Orphan
+
 IEEE 1394 SUBSYSTEM
 P:      Ben Collins
 M:      ben.collins@ubuntu.com
@@ -2120,14 +2130,12 @@ S:	Maintained
 
 ISAPNP
 P:      Jaroslav Kysela
-M:      perex@suse.cz
+M:      perex@perex.cz
 S:      Maintained
 
 ISDN SUBSYSTEM
 P:      Karsten Keil
 M:      kkeil@suse.de
-P:      Kai Germaschewski
-M:      kai.germaschewski@gmx.de
 L:      isdn4linux@listserv.isdn4linux.de
 W:      http://www.isdn4linux.de
 T:      git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git
@@ -2196,8 +2204,6 @@ L:	autofs@linux.kernel.org
 S:      Maintained
 
 KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*)
-P:      Kai Germaschewski
-M:      kai@germaschewski.name
 P:      Sam Ravnborg
 M:      sam@ravnborg.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
@@ -2392,6 +2398,15 @@ M:	khali@linux-fr.org
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
+LOCKDEP AND LOCKSTAT
+P:      Peter Zijlstra
+M:      peterz@infradead.org
+P:      Ingo Molnar
+M:      mingo@redhat.com
+L:      linux-kernel@vger.kernel.org
+T:      git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git
+S:      Maintained
+
 LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
 P:      Richard Russon (FlatCap)
 M:      ldm@flatcap.org
@@ -2403,7 +2418,7 @@ LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 P:      Eric Moore
 M:      Eric.Moore@lsi.com
 M:      support@lsi.com
-L:      mpt_linux_developer@lsi.com
+L:      DL-MPTFusionLinux@lsi.com
 L:      linux-scsi@vger.kernel.org
 W:      http://www.lsilogic.com/support
 S:      Supported
@@ -2471,7 +2486,7 @@ S: 	Supported
 
 MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
 P:      Michael Kerrisk
-M:      mtk-manpages@gmx.net
+M:      mtk.manpages@gmail.com
 W:      ftp://ftp.kernel.org/pub/linux/docs/manpages
 S:      Maintained
 
@@ -3502,7 +3517,7 @@ S:	Maintained
 
 SOUND
 P:      Jaroslav Kysela
-M:      perex@suse.cz
+M:      perex@perex.cz
 L:      alsa-devel@alsa-project.org (subscribers-only)
 S:      Maintained
 
@@ -3692,7 +3707,7 @@ S:      Maintained
 
 TI OMAP MMC INTERFACE DRIVER
 P:      Carlos Aguiar, Anderson Briglia and Syed Khasim
-M:      linux-omap-open-source@linux.omap.com 
+M:      linux-omap-open-source@linux.omap.com (subscribers only)
 W:      http://linux.omap.com
 W:      http://www.muru.com/linux/omap/
 S:      Maintained
@@ -4177,7 +4192,7 @@ W83791D HARDWARE MONITORING DRIVER
 P:      Charles Spirakis
 M:      bezaur@gmail.com
 L:      lm-sensors@lm-sensors.org
-S:      Maintained
+S:      Odd Fixes
 
 W83793 HARDWARE MONITORING DRIVER
 P:      Rudolf Marek