1 files changed, 68 insertions, 13 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5f76a4f5cd4b..bac3f706f75e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -214,6 +214,12 @@ W:	http://acpi.sourceforge.net/
 T:      git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
 S:      Maintained
 
+ACPI PCI HOTPLUG DRIVER
+P:      Kristen Carlson Accardi
+M:      kristen.c.accardi@intel.com
+L:      pcihpd-discuss@lists.sourceforge.net
+S:      Maintained
+
 AD1816 SOUND DRIVER
 P:      Thorsten Knabe
 M:      Thorsten Knabe <linux@thorsten-knabe.de>
@@ -274,7 +280,7 @@ S:	Maintained
 ALI1563 I2C DRIVER
 P:      Rudolf Marek
 M:      r.marek@sh.cvut.cz
-L:      lm-sensors@lm-sensors.org
+L:      i2c@lm-sensors.org
 S:      Maintained
 
 ALPHA PORT
@@ -601,6 +607,15 @@ W:	http://linuxtv.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:      Maintained
 
+CALGARY x86-64 IOMMU
+P:      Muli Ben-Yehuda
+M:      muli@il.ibm.com
+P:      Jon D. Mason
+M:      jdmason@us.ibm.com
+L:      linux-kernel@vger.kernel.org
+L:      discuss@x86-64.org
+S:      Maintained
+
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:      Steve French
 M:      sfrench@samba.org
@@ -762,6 +777,7 @@ M:	aliakc@web.de
 P:      Jamie Lenehan
 M:      lenehan@twibble.org
 W:      http://twibble.org/dist/dc395x/
+L:      dc395x@twibble.org
 L:      http://lists.twibble.org/mailman/listinfo/dc395x/
 S:      Maintained
 
@@ -958,6 +974,10 @@ P:	Andrey V. Savochkin
 M:      saw@saw.sw.com.sg
 S:      Maintained
 
+EFS FILESYSTEM
+W:      http://aeschi.ch.eu.org/efs/
+S:      Orphan
+
 EMU10K1 SOUND DRIVER
 P:      James Courtier-Dutton
 M:      James@superbug.demon.co.uk
@@ -1240,7 +1260,7 @@ S:	Maintained
 I2C SUBSYSTEM
 P:      Jean Delvare
 M:      khali@linux-fr.org
-L:      lm-sensors@lm-sensors.org
+L:      i2c@lm-sensors.org
 W:      http://www.lm-sensors.nu/
 T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 S:      Maintained
@@ -1492,6 +1512,7 @@ P:	Yi Zhu
 M:      yi.zhu@intel.com
 P:      James Ketrenos
 M:      jketreno@linux.intel.com
+L:      ipw2100-devel@lists.sourceforge.net
 L:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:      http://ipw2100.sourceforge.net
 S:      Supported
@@ -1501,6 +1522,7 @@ P:	Yi Zhu
 M:      yi.zhu@intel.com
 P:      James Ketrenos
 M:      jketreno@linux.intel.com
+L:      ipw2100-devel@lists.sourceforge.net
 L:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:      http://ipw2200.sourceforge.net
 S:      Supported
@@ -1586,7 +1608,7 @@ W:	http://jfs.sourceforge.net/
 T:      git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
 S:      Supported
 
-JOURNALLING LAYER FOR BLOCK DEVICS (JBD)
+JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
 P:      Stephen Tweedie, Andrew Morton
 M:      sct@redhat.com, akpm@osdl.org
 L:      ext2-devel@lists.sourceforge.net
@@ -1630,9 +1652,8 @@ S:	Maintained
 
 KERNEL JANITORS
 P:      Several
-L:      kernel-janitors@osdl.org
+L:      kernel-janitors@lists.osdl.org
 W:      http://www.kerneljanitors.org/
-W:      http://sf.net/projects/kernel-janitor/
 S:      Maintained
 
 KERNEL NFSD
@@ -1664,10 +1685,8 @@ L:	linux-kernel@vger.kernel.org
 S:      Maintained
 
 LAPB module
-P:      Henner Eisen
-M:      eis@baty.hanse.de
 L:      linux-x25@vger.kernel.org
-S:      Maintained
+S:      Orphan
 
 LASI 53c700 driver for PARISC
 P:      James E.J. Bottomley
@@ -1872,6 +1891,12 @@ S:     linux-scsi@vger.kernel.org
 W:     http://megaraid.lsilogic.com
 S:     Maintained
 
+MEMORY MANAGEMENT
+L:      linux-mm@kvack.org
+L:      linux-kernel@vger.kernel.org
+W:      http://www.linux-mm.org
+S:      Maintained
+
 MEMORY TECHNOLOGY DEVICES (MTD)
 P:      David Woodhouse
 M:      dwmw2@infradead.org
@@ -2039,9 +2064,10 @@ L:	linux-kernel@vger.kernel.org
 S:      Maintained
 
 NI5010 NETWORK DRIVER
-P:      Jan-Pascal van Best and Andreas Mohr
-M:      Jan-Pascal van Best <jvbest@qv3pluto.leidenuniv.nl>
-M:      Andreas Mohr <100.30936@germany.net>
+P:      Jan-Pascal van Best
+M:      janpascal@vanbest.org
+P:      Andreas Mohr
+M:      andi@lisas.de
 L:      netdev@vger.kernel.org
 S:      Maintained
 
@@ -2083,7 +2109,7 @@ S:      Maintained
 OPENCORES I2C BUS DRIVER
 P:      Peter Korsgaard
 M:      jacmet@sunsite.dk
-L:      lm-sensors@lm-sensors.org
+L:      i2c@lm-sensors.org
 S:      Maintained
 
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
@@ -2216,6 +2242,7 @@ S:	Maintained
 
 PCMCIA SUBSYSTEM
 P:      Linux PCMCIA Team
+L:      linux-pcmcia@lists.infradead.org
 L:      http://lists.infradead.org/mailman/listinfo/linux-pcmcia
 T:      git kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
 S:      Maintained
@@ -2226,6 +2253,12 @@ M:	tsbogend@alpha.franken.de
 L:      netdev@vger.kernel.org
 S:      Maintained
 
+PER-TASK DELAY ACCOUNTING
+P:      Shailabh Nagar
+M:      nagar@watson.ibm.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 PERSONALITY HANDLING
 P:      Christoph Hellwig
 M:      hch@infradead.org
@@ -2665,6 +2698,11 @@ M:	shemminger@osdl.org
 L:      netdev@vger.kernel.org
 S:      Maintained
 
+SOEKRIS NET48XX LED SUPPORT
+P:      Chris Boot
+M:      bootc@bootc.net
+S:      Maintained
+
 SPARC (sparc32):
 P:      William L. Irwin
 M:      wli@holomorphy.com
@@ -2737,11 +2775,23 @@ P:	Christoph Hellwig
 M:      hch@infradead.org
 S:      Maintained
 
+TC CLASSIFIER
+P:      Jamal Hadi Salim
+M:      hadi@cyberus.ca
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 TI OMAP RANDOM NUMBER GENERATOR SUPPORT
 P:      Deepak Saxena
 M:      dsaxena@plexity.net
 S:      Maintained
 
+TASKSTATS STATISTICS INTERFACE
+P:      Shailabh Nagar
+M:      nagar@watson.ibm.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 TI PARALLEL LINK CABLE DRIVER
 P:     Romain Lievin
 M:     roms@lpg.ticalc.org
@@ -3117,7 +3167,7 @@ S:	Maintained
 VIAPRO SMBUS DRIVER
 P:      Jean Delvare
 M:      khali@linux-fr.org
-L:      lm-sensors@lm-sensors.org
+L:      i2c@lm-sensors.org
 S:      Maintained
 
 UCLINUX (AND M68KNOMMU)
@@ -3165,6 +3215,11 @@ S:	Maintained
 W1 DALLAS'S 1-WIRE BUS
 P:      Evgeniy Polyakov
 M:      johnpol@2ka.mipt.ru
+S:      Maintained
+
+W83791D HARDWARE MONITORING DRIVER
+P:      Charles Spirakis
+M:      bezaur@gmail.com
 L:      lm-sensors@lm-sensors.org
 S:      Maintained