Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6246b7f..71693c5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -182,7 +182,7 @@ S:  Supported
 ACPI
 P:     Len Brown
 M:     len.brown@intel.com
-L:     acpi-devel@lists.sourceforge.net
+L:     linux-acpi@vger.kernel.org
 W:     http://acpi.sourceforge.net/
 T:     git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
 S:     Maintained
@@ -258,6 +258,13 @@ P: Ivan Kokshaysky
 M:     ink@jurassic.park.msu.ru
 S:     Maintained for 2.4; PCI support for 2.6.
 
+AMD GEODE PROCESSOR/CHIPSET SUPPORT
+P:      Jordan Crouse
+M:      info-linux@geode.amd.com
+L:     info-linux@geode.amd.com
+W:     http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
+S:     Supported
+
 APM DRIVER
 P:     Stephen Rothwell
 M:     sfr@canb.auug.org.au
@@ -539,13 +546,6 @@ W: http://linuxtv.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:     Maintained
 
-BUSLOGIC SCSI DRIVER
-P:     Leonard N. Zubkoff
-M:     Leonard N. Zubkoff <lnz@dandelion.com>
-L:     linux-scsi@vger.kernel.org
-W:     http://www.dandelion.com/Linux/
-S:     Maintained
-
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:     Steve French
 M:     sfrench@samba.org
@@ -554,6 +554,11 @@ W: http://us1.samba.org/samba/Linux_CIFS_client.html
 T:     git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
 S:     Supported       
 
+CONFIGFS
+P:     Joel Becker
+M:     Joel Becker <joel.becker@oracle.com>
+S:     Supported
+
 CIRRUS LOGIC GENERIC FBDEV DRIVER
 P:     Jeff Garzik
 M:     jgarzik@pobox.com
@@ -684,13 +689,6 @@ M: pc300@cyclades.com
 W:     http://www.cyclades.com/
 S:     Supported
 
-DAC960 RAID CONTROLLER DRIVER
-P:     Dave Olien
-M      dmo@osdl.org
-W:     http://www.osdl.org/archive/dmo/DAC960
-L:     linux-kernel@vger.kernel.org
-S:     Maintained
-
 DAMA SLAVE for AX.25
 P:     Joerg Reuter
 M:     jreuter@yaina.de
@@ -806,6 +804,7 @@ S:  Maintained
 DOCBOOK FOR DOCUMENTATION
 P:     Martin Waitz
 M:     tali@admingilde.org
+T:     git http://tali.admingilde.org/git/linux-docbook.git
 S:     Maintained
 
 DOUBLETALK DRIVER
@@ -922,7 +921,6 @@ S:  Maintained
 FARSYNC SYNCHRONOUS DRIVER
 P:     Kevin Curtis
 M:     kevin.curtis@farsite.co.uk
-M:     kevin.curtis@farsite.co.uk
 W:     http://www.farsite.co.uk/
 S:     Supported
 
@@ -1230,7 +1228,7 @@ IEEE 1394 SUBSYSTEM
 P:     Ben Collins
 M:     bcollins@debian.org
 P:     Jody McIntyre
-M:     scjody@steamballoon.com
+M:     scjody@modernduck.com
 L:     linux1394-devel@lists.sourceforge.net
 W:     http://www.linux1394.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394.git
@@ -1240,14 +1238,14 @@ IEEE 1394 OHCI DRIVER
 P:     Ben Collins
 M:     bcollins@debian.org
 P:     Jody McIntyre
-M:     scjody@steamballoon.com
+M:     scjody@modernduck.com
 L:     linux1394-devel@lists.sourceforge.net
 W:     http://www.linux1394.org/
 S:     Maintained
 
 IEEE 1394 PCILYNX DRIVER
 P:     Jody McIntyre
-M:     scjody@steamballoon.com
+M:     scjody@modernduck.com
 L:     linux1394-devel@lists.sourceforge.net
 W:     http://www.linux1394.org/
 S:     Maintained
@@ -1693,7 +1691,6 @@ S: Maintained
 
 MARVELL MV64340 ETHERNET DRIVER
 P:     Manish Lachwani
-M:     Manish_Lachwani@pmc-sierra.com
 L:     linux-mips@linux-mips.org
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -1898,6 +1895,15 @@ M:       ajoshi@shell.unixbox.com
 L:     linux-nvidia@lists.surfsouth.com
 S:     Maintained
 
+ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
+P:     Mark Fasheh
+M:     mark.fasheh@oracle.com
+P:     Kurt Hackel
+M:     kurt.hackel@oracle.com
+L:     ocfs2-devel@oss.oracle.com
+W:     http://oss.oracle.com/projects/ocfs2/
+S:     Supported       
+
 OLYMPIC NETWORK DRIVER
 P:     Peter De Shrijver
 M:     p2@ace.ulyssis.student.kuleuven.ac.be
@@ -1982,6 +1988,13 @@ M:       hch@infradead.org
 L:     linux-abi-devel@lists.sourceforge.net
 S:     Maintained
 
+PCI ERROR RECOVERY
+P:     Linas Vepstas
+M:     linas@austin.ibm.com
+L:     linux-kernel@vger.kernel.org
+L:     linux-pci@atrey.karlin.mff.cuni.cz
+S:     Supported
+
 PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)
 P:     Thomas Sailer
 M:     sailer@ife.ee.ethz.ch
@@ -2346,13 +2359,6 @@ P:       Nicolas Pitre
 M:     nico@cam.org
 S:     Maintained
 
-SNA NETWORK LAYER
-P:     Jay Schulist
-M:     jschlst@samba.org
-L:     linux-sna@turbolinux.com
-W:     http://www.linux-sna.org
-S:     Supported
-
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:     Ingo Molnar
 M:     mingo@redhat.com
@@ -2474,7 +2480,7 @@ P:        Paul Mundt
 M:     lethal@linux-sh.org
 P:     Kazumoto Kojima
 M:     kkojima@rr.iij4u.or.jp
-L:     linux-sh@m17n.org
+L:     linuxsh-dev@lists.sourceforge.net
 W:     http://www.linux-sh.org
 W:     http://www.m17n.org/linux-sh/
 W:     http://www.rr.iij4u.or.jp/~kkojima/linux-sh4.html
@@ -2513,6 +2519,19 @@ P:     Romain Lievin
 M:     roms@lpg.ticalc.org
 S:     Maintained
 
+TIPC NETWORK LAYER
+P:     Per Liden
+M:     per.liden@nospam.ericsson.com
+P:     Jon Maloy
+M:     jon.maloy@nospam.ericsson.com
+P:     Allan Stephens
+M:     allan.stephens@nospam.windriver.com
+L:     tipc-discussion@lists.sourceforge.net
+W:     http://tipc.sourceforge.net/
+W:     http://tipc.cslab.ericsson.net/
+T:     git tipc.cslab.ericsson.net:/pub/git/tipc.git
+S:     Maintained
+
 TLAN NETWORK DRIVER
 P:     Samuel Chessman
 M:     chessman@tux.org
@@ -2902,6 +2921,12 @@ W:       http://linuxtv.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:     Maintained
 
+VT8231 HARDWARE MONITOR DRIVER
+P:     Roger Lucas
+M:     roger@planbit.co.uk
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+
 W1 DALLAS'S 1-WIRE BUS
 P:     Evgeniy Polyakov
 M:     johnpol@2ka.mipt.ru