Merge branch 'master'

1 files changed, 45 insertions, 4 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index cf8fd4589748..c67c3e338105 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -274,7 +274,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 +601,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 +771,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
 
@@ -1258,7 +1268,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
@@ -1510,6 +1520,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
@@ -1519,6 +1530,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
@@ -2102,7 +2114,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)
@@ -2235,6 +2247,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
@@ -2245,6 +2258,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
@@ -2684,6 +2703,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
@@ -2756,11 +2780,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
@@ -3136,7 +3172,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)
@@ -3184,6 +3220,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