2.4.0-ac7

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.4.0/MAINTAINERS linux.ac/MAINTAINERS
--- linux-2.4.0/MAINTAINERS   Sun Dec 31 17:31:15 2000
+++ linux.ac/MAINTAINERS   Wed Jan 10 20:29:22 2001
@@ -484,6 +484,12 @@
 W:   http://www.icp-vortex.com/
 S:   Supported
 
+GENERIC HDLC DRIVER, N2 AND C101 DRIVERS
+P:   Krzysztof Halasa
+M:   khc@pm.waw.pl
+W:   http://hq.pm.waw.pl/hdlc/
+S:   Maintained
+
 HAYES ESP SERIAL DRIVER
 P:   Andrew J. Robinson
 M:   arobinso@nyx.net
@@ -529,7 +535,7 @@
 
 HIPPI
 P:   Jes Sorensen
-M:   Jes.Sorensen@cern.ch
+M:   jes@linuxcare.com
 L:   linux-hippi@sunsite.auc.dk
 S:   Maintained
 
@@ -594,7 +600,14 @@
 W:   http://www.kernel.dk
 S:   Maintained
 
-IDE/ATAPI TAPE/FLOPPY DRIVERS
+IDE/ATAPI FLOPPY DRIVERS
+P:   Paul Bristow
+M:   Paul Bristow <paul@paulbristow.net>
+W:   http://paulbristow.net/linux/idefloppy.html
+L:   linux-kernel@vger.kernel.org
+S:   Maintained
+
+IDE/ATAPI TAPE DRIVERS
 P:   Gadi Oxman
 M:   Gadi Oxman <gadio@netvision.net.il>
 L:   linux-kernel@vger.kernel.org
@@ -751,7 +764,7 @@
 
 M68K
 P:   Jes Sorensen
-M:   Jes.Sorensen@cern.ch
+M:   jes@linuxcare.com
 W:   http://www.clark.net/pub/lawrencc/linux/index.html
 L:   linux-m68k@lists.linux-m68k.org
 S:   Maintained
@@ -769,7 +782,7 @@
 W:   http://www.tazenda.demon.co.uk/phil/linux-hp
 S:   Maintained
 
-MAESTRO PCI SOUND DRIVER
+MAESTRO PCI SOUND DRIVERS
 P:   Zach Brown
 M:   zab@zabbo.net
 S:   Odd Fixes
@@ -1041,6 +1054,14 @@
 L:   rtl@rtlinux.org
 W:   www.rtlinux.org
 S:   Maintained
+
+S390
+P:   Martin Schwidefsky
+M:   schwidefsky@de.ibm.com
+M:   linux390@de.ibm.com
+L:   linux-390@vm.marist.edu
+W:   http://oss.software.ibm.com/developerworks/opensource/linux390
+S:   Supported
 
 SA1100 SUPPORT
 P:   Nicolas Pitre