Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c40f0ae965523a04ef327be9c13c97923e67fb6c..36c7bc641dba3efe58f3e78b9a51a62b7ea515b3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -640,8 +640,8 @@ S:  Maintained
 ASYNCHRONOUS TRANSFERS/TRANSFORMS API
 P:     Dan Williams
 M:     dan.j.williams@intel.com
-P:     Shannon Nelson
-M:     shannon.nelson@intel.com
+P:     Maciej Sosnowski
+M:     maciej.sosnowski@intel.com
 L:     linux-kernel@vger.kernel.org
 W:     http://sourceforge.net/projects/xscaleiop
 S:     Supported
@@ -697,7 +697,7 @@ S:  Supported
 ATMEL LCDFB DRIVER
 P:     Nicolas Ferre
 M:     nicolas.ferre@atmel.com
-L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 
 ATMEL MACB ETHERNET DRIVER
@@ -1202,7 +1202,7 @@ S:        Maintained
 CYBLAFB FRAMEBUFFER DRIVER
 P:     Knut Petersen
 M:     Knut_Petersen@t-online.de
-L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 
 CYCLADES 2X SYNC CARD DRIVER
@@ -1255,8 +1255,8 @@ W:        http://linux-net.osdl.org/index.php/DCCP
 S:     Maintained
 
 DECnet NETWORK LAYER
-P:     Patrick Caulfield
-M:     patrick@tykepenguin.com
+P:     Christine Caulfield
+M:     christine.caulfield@googlemail.com
 W:     http://linux-decnet.sourceforge.net
 L:     linux-decnet-user@lists.sourceforge.net
 S:     Maintained
@@ -1318,14 +1318,13 @@ L:      linux-kernel@vger.kernel.org
 S:     Maintained
 
 DISTRIBUTED LOCK MANAGER
-P:     Patrick Caulfield
-M:     pcaulfie@redhat.com
+P:     Christine Caulfield
+M:     ccaulfie@redhat.com
 P:     David Teigland
 M:     teigland@redhat.com
 L:     cluster-devel@redhat.com
 W:     http://sources.redhat.com/cluster/
-T:     git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git
-T:     git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git
+T:     git kernel.org:/pub/scm/linux/kernel/git/teigland/dlm.git
 S:     Supported
 
 DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
@@ -1335,8 +1334,8 @@ L:        netdev@vger.kernel.org
 S:     Maintained
 
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
-P:     Shannon Nelson
-M:     shannon.nelson@intel.com
+P:     Maciej Sosnowski
+M:     maciej.sosnowski@intel.com
 P:     Dan Williams
 M:     dan.j.williams@intel.com
 L:     linux-kernel@vger.kernel.org
@@ -1580,7 +1579,7 @@ S:        Supported
 FRAMEBUFFER LAYER
 P:     Antonino Daplas
 M:     adaplas@gmail.com
-L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://linux-fbdev.sourceforge.net/
 S:     Maintained
 
@@ -1616,6 +1615,7 @@ S:        Maintained
 FILESYSTEMS (VFS and infrastructure)
 P:     Alexander Viro
 M:     viro@zeniv.linux.org.uk
+L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
 
 FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>)
@@ -1712,9 +1712,7 @@ T:        git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git release
 S:     Maintained
 
 HARDWARE RANDOM NUMBER GENERATOR CORE
-P:     Michael Buesch
-M:     mb@bu3sch.de
-S:     Maintained
+S:     Orphaned
 
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 P:     Robert Love
@@ -1923,7 +1921,7 @@ S:        Maintained
 
 IDE/ATAPI CDROM DRIVER
 P:     Borislav Petkov
-M:     bbpetkov@yahoo.de
+M:     petkovbb@gmail.com
 L:     linux-ide@vger.kernel.org
 S:     Maintained
 
@@ -1964,7 +1962,7 @@ L:        linux1394-devel@lists.sourceforge.net
 S:     Maintained
 
 IMS TWINTURBO FRAMEBUFFER DRIVER
-L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Orphan
 
 INFINIBAND SUBSYSTEM
@@ -1998,13 +1996,13 @@ S:      Maintained
 INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 P:     Sylvain Meyer
 M:     sylvain.meyer@worldonline.fr
-L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 
 INTEL 810/815 FRAMEBUFFER DRIVER
 P:     Antonino Daplas
 M:     adaplas@gmail.com
-L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 
 INTEL IA32 MICROCODE UPDATE SUPPORT
@@ -2013,8 +2011,8 @@ M:        tigran@aivazian.fsnet.co.uk
 S:     Maintained
 
 INTEL I/OAT DMA DRIVER
-P:     Shannon Nelson
-M:     shannon.nelson@intel.com
+P:     Maciej Sosnowski
+M:     maciej.sosnowski@intel.com
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 
@@ -2600,7 +2598,7 @@ S:        Odd Fixes for 2.4; Maintained for 2.6.
 MATROX FRAMEBUFFER DRIVER
 P:     Petr Vandrovec
 M:     vandrove@vc.cvut.cz
-L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 
 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
@@ -2909,7 +2907,7 @@ S:        Maintained
 NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
 P:     Antonino Daplas
 M:     adaplas@gmail.com
-L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 
 OPENCORES I2C BUS DRIVER
@@ -3238,13 +3236,13 @@ S:      Maintained
 RADEON FRAMEBUFFER DISPLAY DRIVER
 P:     Benjamin Herrenschmidt
 M:     benh@kernel.crashing.org
-L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 
 RAGE128 FRAMEBUFFER DISPLAY DRIVER
 P:     Paul Mackerras
 M:     paulus@samba.org
-L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
@@ -3349,7 +3347,7 @@ S:        Maintained
 S3 SAVAGE FRAMEBUFFER DRIVER
 P:     Antonino Daplas
 M:     adaplas@gmail.com
-L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:     Maintained
 
 S390
@@ -3561,6 +3559,8 @@ P:        Christoph Lameter
 M:     clameter@sgi.com
 P:     Pekka Enberg
 M:     penberg@cs.helsinki.fi
+P:     Matt Mackall
+M:     mpm@selenic.com
 L:     linux-mm@kvack.org
 S:     Maintained
 
@@ -4259,7 +4259,7 @@ S:        Maintained
 
 VT8231 HARDWARE MONITOR DRIVER
 P:     Roger Lucas
-M:     roger@planbit.co.uk
+M:     vt8231@hiddenengine.co.uk
 L:     lm-sensors@lm-sensors.org
 S:     Maintained