Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a384551a597810724237d097cc622a9f3a14ecb7..6261597a1bce3037b386628760f0821189c498a5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -275,6 +275,12 @@ M: khali@linux-fr.org
 L:     lm-sensors@lm-sensors.org
 S:     Maintained
 
+ADM1029 HARDWARE MONITOR DRIVER
+P:     Corentin Labbe
+M:     corentin.labbe@geomatys.fr
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+
 ADT746X FAN DRIVER
 P:     Colin Leroy
 M:     colin@colino.net
@@ -2630,8 +2636,8 @@ T:        git kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
 S:     Maintained
 
 PCNET32 NETWORK DRIVER
-P:     Thomas Bogendörfer
-M:     tsbogend@alpha.franken.de
+P:     Don Fry
+M:     pcnet32@verizon.net
 L:     netdev@vger.kernel.org
 S:     Maintained