Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index abedca58d8bd31b596eb8dc0736428982820a4c3..abbedb658c29778576b693fb26dfb40c78b13067 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -461,7 +461,7 @@ F:  arch/x86/include/asm/amd_iommu*.h
 
 AMD MICROCODE UPDATE SUPPORT
 P:     Andreas Herrmann
-M:     andeas.herrmann3@amd.com
+M:     andreas.herrmann3@amd.com
 L:     amd64-microcode@amd64.org
 S:     Supported
 F:     arch/x86/kernel/microcode_amd.c
@@ -1894,7 +1894,7 @@ F:        fs/ecryptfs/
 EDAC-CORE
 P:     Doug Thompson
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Supported
 F:     Documentation/edac.txt
@@ -1906,7 +1906,7 @@ P:        Mark Gross
 P:     Doug Thompson
 M:     mark.gross@intel.com
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/e752x_edac.c
@@ -1914,7 +1914,7 @@ F:        drivers/edac/e752x_edac.c
 EDAC-E7XXX
 P:     Doug Thompson
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/e7xxx_edac.c
@@ -1922,7 +1922,7 @@ F:        drivers/edac/e7xxx_edac.c
 EDAC-I82443BXGX
 P:     Tim Small
 M:     tim@buttersideup.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i82443bxgx_edac.c
@@ -1930,7 +1930,7 @@ F:        drivers/edac/i82443bxgx_edac.c
 EDAC-I3000
 P:     Jason Uhlenkott
 M:     juhlenko@akamai.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i3000_edac.c
@@ -1938,7 +1938,7 @@ F:        drivers/edac/i3000_edac.c
 EDAC-I5000
 P:     Doug Thompson
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i5000_edac.c
@@ -1946,7 +1946,7 @@ F:        drivers/edac/i5000_edac.c
 EDAC-I5400
 P:     Mauro Carvalho Chehab
 M:     mchehab@redhat.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i5400_edac.c
@@ -1956,7 +1956,7 @@ P:        Ranganathan Desikan
 P:     Arvind R.
 M:     rdesikan@jetzbroadband.com
 M:     arvind@acarlab.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i82975x_edac.c
@@ -1964,7 +1964,7 @@ F:        drivers/edac/i82975x_edac.c
 EDAC-PASEMI
 P:     Egor Martovetsky
 M:     egor@pasemi.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/pasemi_edac.c
@@ -1972,7 +1972,7 @@ F:        drivers/edac/pasemi_edac.c
 EDAC-R82600
 P:     Tim Small
 M:     tim@buttersideup.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/r82600_edac.c
@@ -2592,8 +2592,8 @@ S:        Maintained
 F:     fs/hpfs/
 
 HSO 3G MODEM DRIVER
-P:     Denis Joseph Barrow
-M:     d.barow@option.com
+P:     Jan Dumon
+M:     j.dumon@option.com
 W:     http://www.pharscape.org
 S:     Maintained
 F:     drivers/net/usb/hso.c
@@ -3680,6 +3680,7 @@ L:        microblaze-uclinux@itee.uq.edu.au
 W:     http://www.monstr.eu/fdt/
 T:     git git://git.monstr.eu/linux-2.6-microblaze.git
 S:     Supported
+F:     arch/microblaze/
 
 MICROTEK X6 SCANNER
 P:     Oliver Neukum
@@ -4971,8 +4972,8 @@ S:        Maintained for 2.6.
 F:     Documentation/sgi-visws.txt
 
 SGI XP/XPC/XPNET DRIVER
-P:     Dean Nelson
-M:     dcn@sgi.com
+P:     Robin Holt
+M:     holt@sgi.com
 S:     Maintained
 F:     drivers/misc/sgi-xp/
 
@@ -5306,7 +5307,9 @@ L:        linux-sh@vger.kernel.org
 W:     http://www.linux-sh.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
 S:     Supported
+F:     Documentation/sh/
 F:     arch/sh/
+F:     drivers/sh/
 
 SUSPEND TO RAM
 P:     Len Brown