Merge with 2.3.10.

1 files changed, 42 insertions, 9 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 45b782ec9..bec26c8da 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16,8 +16,8 @@ trivial patch so apply some common sense.
 	SMC etherpower for that.)
 
 3.	Make sure your changes compile correctly in multiple
-	configurations. In paticular check changes work both as a module
-	and built into the kernel.
+	configurations. In particular check that changes work both as a
+	module and built into the kernel.
 
 4.	When you are happy with a change make it generally available for
 	testing and await feedback.
@@ -28,7 +28,7 @@ trivial patch so apply some common sense.
 	and variable names.  These aren't as silly as they seem. One
 	job the maintainers (and especially Linus) do is to keep things
 	looking the same. Sometimes this means that the clever hack in
-	your driver to get around a problem actual needs to become a
+	your driver to get around a problem actually needs to become a
 	generalized kernel feature ready for next time. See 
 	Documentation/CodingStyle for guidance here.
 
@@ -49,8 +49,8 @@ trivial patch so apply some common sense.
 
 Maintainers List (try to look for most precise areas first)
 
-Note: For the hard of thinking, this list is meant to remain in Alphabetical
-order. If you could add yourselves to it in Alphabetical order that would
+Note: For the hard of thinking, this list is meant to remain in alphabetical
+order. If you could add yourselves to it in alphabetical order that would
 so much easier [Ed]
 
 P: Person
@@ -163,6 +163,12 @@ L:	linux-hams@vger.rutgers.edu
 W:	http://www.ife.ee.ethz.ch/~sailer/ham/ham.html
 S:	Maintained
 
+BERKSHIRE PRODUCTS PC WATCHDOG DRIVER
+P:	Kenji Hollis
+M:	kenji@bitgate.com
+W:	http://ftp.bitgate.com/pcwd/
+S:	Maintained
+
 BUSLOGIC SCSI DRIVER
 P:	Leonard N. Zubkoff
 M:	Leonard N. Zubkoff <lnz@dandelion.com>
@@ -271,6 +277,12 @@ M:	mike@i-Connect.Net
 L:	linux-eata@i-connect.net, linux-scsi@vger.rutgers.edu
 S:	Maintained
 
+COMPAQ SMART2 RAID DRIVER
+P:	Charles White	
+M:	Charles White <arrays@compaq.com>
+L:	compaqandlinux@yps.org	
+S:	Maintained
+
 EATA ISA/EISA/PCI SCSI DRIVER
 P:	Dario Ballabio
 M:	dario@milano.europe.dg.com
@@ -579,6 +591,26 @@ M:	emoenke@gwdg.de
 L:	linux-kernel@vger.rutgers.edu
 S:	Maintained
 
+OLYMPIC NETWORK DRIVER
+P:	Peter De Shrijver
+M:	p2@ace.ulyssis.sutdent.kuleuven.ac.be	
+P:	Mike Phillips
+M:	phillim@amtrak.com
+L:	linux-net@vger.rutgers.edu
+L:	linux-tr@emissary.aus-etc.com
+W:	http://www.linuxtr.net
+S:	Maintained
+
+OLYMPIC NETWORK DRIVER
+P:	Peter De Shrijver
+M:	p2@ace.ulyssis.sutdent.kuleuven.ac.be	
+P:	Mike Phillips
+M:	phillim@amtrak.com
+L:	linux-net@vger.rutgers.edu
+L:	linux-tr@emissary.aus-etc.com
+W:	http://www.linuxtr.net
+S:	Maintained
+
 OPL3-SA2, SA3, and SAx DRIVER
 P:	Scott Murray
 M:	scottm@interlog.com
@@ -645,7 +677,7 @@ S:	Maintained
 
 REAL TIME CLOCK DRIVER
 P:	Paul Gortmaker
-M	gpg109@rsphy1.anu.edu.au
+M:	gpg109@rsphy1.anu.edu.au
 L:	linux-kernel@vger.rutgers.edu
 S:	Maintained
 
@@ -697,9 +729,10 @@ M:	mingo@redhat.com
 S:	Maintained
 
 SMB FILESYSTEM
-P:	Volker Lendecke
-M:	vl@kki.org
-L:	samba@listproc.anu.edu.au
+P:	Andrew Tridgell
+M:	tridge@samba.org
+W:	http://samba.org/
+L:	samba@samba.org
 S:	Maintained
 
 SMP: (except SPARC)