Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1b254cd..79cfc19 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -244,10 +244,10 @@ S:        Maintained
 ALPHA PORT
 P:     Richard Henderson
 M:     rth@twiddle.net
-S:     Odd Fixes for 2.4; Maintained for 2.5.
+S:     Odd Fixes for 2.4; Maintained for 2.6.
 P:     Ivan Kokshaysky
 M:     ink@jurassic.park.msu.ru
-S:     Maintained for 2.4; PCI support for 2.5.
+S:     Maintained for 2.4; PCI support for 2.6.
 
 APM DRIVER
 P:     Stephen Rothwell
@@ -396,6 +396,11 @@ P: Marcel Holtmann
 M:     marcel@holtmann.org
 S:     Maintained
 
+BLUETOOTH HIDP LAYER
+P:     Marcel Holtmann
+M:     marcel@holtmann.org
+S:     Maintained
+
 BLUETOOTH HCI UART DRIVER
 P:     Marcel Holtmann
 M:     marcel@holtmann.org
@@ -703,6 +708,12 @@ M: jrv@vanzandt.mv.com
 L:     blinux-list@redhat.com
 S:     Maintained
 
+DRIVER CORE, KOBJECTS, AND SYSFS
+P:     Greg Kroah-Hartman
+M:     greg@kroah.com
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+
 DRM DRIVERS
 L:     dri-devel@lists.sourceforge.net
 S:     Supported
@@ -1104,7 +1115,7 @@ S:        Maintained
 
 IOC3 DRIVER
 P:     Ralf Baechle
-M:     ralf@oss.sgi.com
+M:     ralf@linux-mips.org
 L:     linux-mips@linux-mips.org
 S:     Maintained
 
@@ -1272,6 +1283,13 @@ W:       http://www.penguinppc.org/
 L:     linuxppc-embedded@lists.linuxppc.org
 S:     Maintained
 
+LINUX FOR POWERPC EMBEDDED PPC85XX
+P:     Kumar Gala
+M:     kumar.gala@freescale.com
+W:     http://www.penguinppc.org/
+L:     linuxppc-embedded@lists.linuxppc.org
+S:     Maintained
+
 LLC (802.2)
 P:     Arnaldo Carvalho de Melo
 M:     acme@conectiva.com.br
@@ -1339,6 +1357,13 @@ P:       Zach Brown
 M:     zab@zabbo.net
 S:     Odd Fixes
 
+MARVELL MV64340 ETHERNET DRIVER
+P:     Manish Lachwani
+M:     Manish_Lachwani@pmc-sierra.com
+L:     linux-mips@linux-mips.org
+L:     netdev@oss.sgi.com
+S:     Supported
+
 MATROX FRAMEBUFFER DRIVER
 P:     Petr Vandrovec
 M:     vandrove@vc.cvut.cz
@@ -1359,7 +1384,7 @@ S:        Maintained
 
 MIPS
 P:     Ralf Baechle
-M:     ralf@gnu.org
+M:     ralf@linux-mips.org
 W:     http://oss.sgi.com/mips/mips-howto.html
 L:     linux-mips@linux-mips.org
 S:     Maintained
@@ -1837,7 +1862,7 @@ P:        Andrey Panin
 M:     pazke@donpac.ru
 L:     linux-visws-devel@lists.sf.net
 W:     http://linux-visws.sf.net
-S:     Maintained for 2.5.
+S:     Maintained for 2.6.
 
 SIS 5513 IDE CONTROLLER DRIVER
 P:     Lionel Bouton
@@ -1944,11 +1969,6 @@ M:       jbglaw@lug-owl.de
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
-STALLION TECHNOLOGIES MULTIPORT SERIAL BOARDS
-M:     support@stallion.oz.au
-W:     http://www.stallion.com
-S:     Supported
-
 STARFIRE/DURALAN NETWORK DRIVER
 P:     Ion Badulescu
 M:     ionut@cs.columbia.edu
@@ -1965,16 +1985,26 @@ W:      http://mpeg.openprojects.net/
 W:     http://www.stradis.com/
 S:     Maintained
 
-SUPERH
-P:     Niibe Yutaka
-M:     gniibe@m17n.org
+SUPERH (sh)
+P:     Paul Mundt
+M:     lethal@linux-sh.org
 P:     Kazumoto Kojima
 M:     kkojima@rr.iij4u.or.jp
 L:     linux-sh@m17n.org
+W:     http://www.linux-sh.org
 W:     http://www.m17n.org/linux-sh/
 W:     http://www.rr.iij4u.or.jp/~kkojima/linux-sh4.html
 S:     Maintained
 
+SUPERH64 (sh64)
+P:     Paul Mundt
+M:     lethal@linux-sh.org
+P:     Richard Curnow
+M:     richard.curnow@superh.com
+L:     linuxsh-shmedia-dev@lists.sourceforge.net
+W:     http://www.linux-sh.org
+S:     Maintained
+
 SUN3/3X
 P:     Sam Creasey
 M:     sammy@sammy.net
@@ -2344,6 +2374,12 @@ P:       Gerd Knorr
 M:     kraxel@bytesex.org
 S:     Maintained
 
+W1 DALLAS'S 1-WIRE BUS
+P:     Evgeniy Polyakov
+M:     johnpol@2ka.mipt.ru
+L:     sensors@stimpy.netroedge.com
+S:     Maintained
+
 WAN ROUTER & SANGOMA WANPIPE DRIVERS & API (X.25, FRAME RELAY, PPP, CISCO HDLC)
 P:     Nenad Corbic
 M:     ncorbic@sangoma.com