Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a384551a597810724237d097cc622a9f3a14ecb7..c268b51e4518f85ac2aaa5ca7585f988585260fa 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
@@ -673,6 +679,11 @@ L: linux-hams@vger.kernel.org
 W:     http://www.linux-ax25.org/
 S:     Maintained
 
+BACKLIGHT CLASS/SUBSYSTEM
+P:     Richard Purdie
+M:     rpurdie@rpsys.net
+S:     Maintained
+
 BAYCOM/HDLCDRV DRIVERS FOR AX.25
 P:     Thomas Sailer
 M:     t.sailer@alumni.ethz.ch
@@ -1295,7 +1306,7 @@ S:        Maintained
 ETHERNET BRIDGE
 P:     Stephen Hemminger
 M:     shemminger@linux-foundation.org
-L:     bridge@osdl.org
+L:     bridge@lists.osdl.org
 W:     http://bridge.sourceforge.net/
 S:     Maintained
 
@@ -1310,13 +1321,13 @@ S:      Maintained
 
 EXT3 FILE SYSTEM
 P:     Stephen Tweedie, Andrew Morton
-M:     sct@redhat.com, akpm@osdl.org, adilger@clusterfs.com
+M:     sct@redhat.com, akpm@linux-foundation.org, adilger@clusterfs.com
 L:     linux-ext4@vger.kernel.org
 S:     Maintained
 
 EXT4 FILE SYSTEM
 P:     Stephen Tweedie, Andrew Morton
-M:     sct@redhat.com, akpm@osdl.org, adilger@clusterfs.com
+M:     sct@redhat.com, akpm@linux-foundation.org, adilger@clusterfs.com
 L:     linux-ext4@vger.kernel.org
 S:     Maintained
 
@@ -1913,7 +1924,7 @@ S:        Supported
 
 JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
 P:     Stephen Tweedie, Andrew Morton
-M:     sct@redhat.com, akpm@osdl.org
+M:     sct@redhat.com, akpm@linux-foundation.org
 L:     linux-ext4@vger.kernel.org
 S:     Maintained
 
@@ -1984,7 +1995,7 @@ P:        Eric Biederman
 M:     ebiederm@xmission.com
 W:     http://www.xmission.com/~ebiederm/files/kexec/
 L:     linux-kernel@vger.kernel.org
-L:     fastboot@osdl.org
+L:     fastboot@lists.osdl.org
 S:     Maintained
 
 KPROBES
@@ -2322,7 +2333,7 @@ S:        Maintained
 NETEM NETWORK EMULATOR
 P:     Stephen Hemminger
 M:     shemminger@linux-foundation.org
-L:     netem@osdl.org
+L:     netem@lists.osdl.org
 S:     Maintained
 
 NETFILTER/IPTABLES/IPCHAINS
@@ -2361,7 +2372,7 @@ S:        Maintained
 
 NETWORK DEVICE DRIVERS
 P:     Andrew Morton
-M:     akpm@osdl.org
+M:     akpm@linux-foundation.org
 P:     Jeff Garzik
 M:     jgarzik@pobox.com
 L:     netdev@vger.kernel.org
@@ -2630,8 +2641,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
 
@@ -2737,7 +2748,7 @@ S:        Supported
 PVRUSB2 VIDEO4LINUX DRIVER
 P:     Mike Isely
 M:     isely@pobox.com
-L:     pvrusb2@isely.net
+L:     pvrusb2@isely.net       (subscribers-only)
 L:     video4linux-list@redhat.com
 W:     http://www.isely.net/pvrusb2/
 S:     Maintained
@@ -3056,7 +3067,7 @@ S:        Supported
 SOFTWARE SUSPEND:
 P:     Pavel Machek
 M:     pavel@suse.cz
-L:     linux-pm@osdl.org
+L:     linux-pm@lists.osdl.org
 S:     Maintained
 
 SONIC NETWORK DRIVER