Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9ea954ace2ffabdb21b45de731517261be3605fa..6261597a1bce3037b386628760f0821189c498a5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -247,6 +247,13 @@ L: linux-acpi@vger.kernel.org
 W:     http://acpi.sourceforge.net/
 S:     Supported
 
+ACPI VIDEO DRIVER
+P:     Luming Yu
+M:     luming.yu@intel.com
+L:     linux-acpi@vger.kernel.org
+W:     http://acpi.sourceforge.net/
+S:     Supported
+
 AD1816 SOUND DRIVER
 P:     Thorsten Knabe
 M:     Thorsten Knabe <linux@thorsten-knabe.de>
@@ -268,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
@@ -620,6 +633,11 @@ P: Haavard Skinnemoen
 M:     hskinnemoen@atmel.com
 S:     Supported
 
+ATMEL SPI DRIVER
+P:     Haavard Skinnemoen
+M:     hskinnemoen@atmel.com
+S:     Supported
+
 ATMEL WIRELESS DRIVER
 P:     Simon Kelley
 M:     simon@thekelleys.org.uk
@@ -1002,14 +1020,12 @@ L:      cycsyn-devel@bazar.conectiva.com.br
 S:     Maintained
 
 CYCLADES ASYNC MUX DRIVER
-M:     async@cyclades.com
 W:     http://www.cyclades.com/
-S:     Supported
+S:     Orphan
 
 CYCLADES PC300 DRIVER
-M:     pc300@cyclades.com
 W:     http://www.cyclades.com/
-S:     Supported
+S:     Orphan
 
 DAMA SLAVE for AX.25
 P:     Joerg Reuter
@@ -2525,6 +2541,12 @@ M:       olof@lixom.net
 L:     netdev@vger.kernel.org
 S:     Maintained
 
+PA SEMI SMBUS DRIVER
+P:     Olof Johansson
+M:     olof@lixom.net
+L:     i2c@lm-sensors.org
+S:     Maintained
+
 PARALLEL PORT SUPPORT
 P:     Phil Blundell
 M:     philb@gnu.org
@@ -2614,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
 
@@ -3052,6 +3074,8 @@ S:        Maintained
 SONY VAIO CONTROL DEVICE DRIVER
 P:     Stelian Pop
 M:     stelian@popies.net
+P:     Mattia Dongili
+M:     malattia@linux.it
 W:     http://popies.net/sonypi/
 S:     Maintained
 
@@ -3770,6 +3794,7 @@ P:        Andi Kleen
 M:     ak@suse.de
 L:     discuss@x86-64.org
 W:     http://www.x86-64.org
+T:     quilt ftp://ftp.firstfloor.org/pub/ak/x86_64/quilt-current
 S:     Maintained
 
 YAM DRIVER FOR AX.25