Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d10e629db5630de18fe9df492fa0df644a8ec78b..4dcd2f1f14d67845ffec12639160325debe35e5e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -181,6 +181,12 @@ M: bcrl@kvack.org
 L:     linux-aio@kvack.org
 S:     Supported
 
+ABIT UGURU HARDWARE MONITOR DRIVER
+P:     Hans de Goede
+M:     j.w.r.degoede@hhs.nl
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+
 ACENIC DRIVER
 P:     Jes Sorensen
 M:     jes@trained-monkey.org
@@ -568,6 +574,12 @@ L: linuxppc-dev@ozlabs.org
 W:     http://www.penguinppc.org/ppc64/
 S:     Supported
 
+BROADCOM B44 10/100 ETHERNET DRIVER
+P:     Gary Zambrano
+M:     zambrano@broadcom.com
+L:     netdev@vger.kernel.org
+S:     Supported
+
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 P:     Michael Chan
 M:     mchan@broadcom.com
@@ -2057,6 +2069,12 @@ M:      adaplas@pol.net
 L:      linux-fbdev-devel@lists.sourceforge.net
 S:      Maintained
 
+OPENCORES I2C BUS DRIVER
+P:     Peter Korsgaard
+M:     jacmet@sunsite.dk
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 P:     Mark Fasheh
 M:     mark.fasheh@oracle.com
@@ -2528,12 +2546,6 @@ M:       thomas@winischhofer.net
 W:     http://www.winischhofer.at/linuxsisusbvga.shtml
 S:     Maintained
 
-SMSC47M1 HARDWARE MONITOR DRIVER
-P:     Jean Delvare
-M:     khali@linux-fr.org
-L:     lm-sensors@lm-sensors.org
-S:     Odd Fixes
-
 SMB FILESYSTEM
 P:     Urban Widmark
 M:     urban@teststation.com
@@ -3146,12 +3158,6 @@ L:       wbsd-devel@list.drzeus.cx
 W:     http://projects.drzeus.cx/wbsd
 S:     Maintained
 
-W83L785TS HARDWARE MONITOR DRIVER
-P:     Jean Delvare
-M:     khali@linux-fr.org
-L:     lm-sensors@lm-sensors.org
-S:     Odd Fixes
-
 WATCHDOG DEVICE DRIVERS
 P:     Wim Van Sebroeck
 M:     wim@iguana.be