Some bad email addresses are removed:

        [EMAIL PROTECTED]
        [EMAIL PROTECTED]
        
Some are updated:

        [EMAIL PROTECTED] to [EMAIL PROTECTED]
        [EMAIL PROTECTED] to [EMAIL PROTECTED]
        [EMAIL PROTECTED] to [EMAIL PROTECTED]

The PCMCIA entry is corrected to a web address

The ZR36120 VIDEO FOR LINUX DRIVER entry is removed

Signed-off-by: Joe Perches <[EMAIL PROTECTED]>

diff --git a/MAINTAINERS b/MAINTAINERS
index f3d7256..453bc80 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -85,13 +85,12 @@ S: Status, one of the following:
                        should be using that.
 
 3C359 NETWORK DRIVER
 P:     Mike Phillips
 M:     [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
-L:     [EMAIL PROTECTED]
 W:     http://www.linuxtr.net
 S:     Maintained
 
 3C505 NETWORK DRIVER
 P:     Philip Blundell
 M:     [EMAIL PROTECTED]
@@ -164,13 +163,12 @@ L:        [EMAIL PROTECTED]
 W:     http://swik.net/v9fs
 T:     git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git
 S:     Maintained
 
 A2232 SERIAL BOARD DRIVER
 P:     Enver Haase
-M:     [EMAIL PROTECTED]
 M:     [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
 S:     Maintained
 
 AIO
 P:     Benjamin LaHaise
@@ -436,13 +434,13 @@ P:        Lennert Buytenhek
 M:     [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED] (subscribers-only)
 S:     Maintained
 
 ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
 P:      Andrew Victor
-M:      [EMAIL PROTECTED]
+M:      [EMAIL PROTECTED]
 L:      [EMAIL PROTECTED] (subscribers-only)
 W:      http://maxim.org.za/at91_26.html
 S:      Maintained
 
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
 P:     Lennert Buytenhek
@@ -2061,13 +2059,13 @@ M:      [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
 S:     Maintained
 
 IOC3 SERIAL DRIVER
 P:     Pat Gefre
 M:     [EMAIL PROTECTED]
-L:     [EMAIL PROTECTED]
+L:     [EMAIL PROTECTED]
 S:     Maintained
 
 IP MASQUERADING:
 P:     Juanjo Ciarlante
 M:     [EMAIL PROTECTED]
 S:     Maintained
@@ -2812,13 +2810,12 @@ S:      Supported
 OLYMPIC NETWORK DRIVER
 P:     Peter De Shrijver
 M:     [EMAIL PROTECTED]
 P:     Mike Phillips
 M:     [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
-L:     [EMAIL PROTECTED]
 W:     http://www.linuxtr.net
 S:     Maintained
 
 OMNIKEY CARDMAN 4000 DRIVER
 P:     Harald Welte
 M:     [EMAIL PROTECTED]
@@ -2950,13 +2947,13 @@ M:      [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
 S:     Supported
 
 PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
 L:     [EMAIL PROTECTED]
-L:     http://lists.infradead.org/mailman/listinfo/linux-pcmcia
+W:     http://lists.infradead.org/mailman/listinfo/linux-pcmcia
 T:     git kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
 S:     Maintained
 
 PCNET32 NETWORK DRIVER
 P:     Don Fry
 M:     [EMAIL PROTECTED]
@@ -3728,13 +3725,12 @@ W:      http://sourceforge.net/projects/tlan/
 S:     Maintained
 
 TOKEN-RING NETWORK DRIVER
 P:     Mike Phillips
 M:     [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
-L:     [EMAIL PROTECTED]
 W:     http://www.linuxtr.net
 S:     Maintained
 
 TOSHIBA ACPI EXTRAS DRIVER
 P:     John Belmonte
 M:     [EMAIL PROTECTED]
@@ -4046,13 +4042,13 @@ L:      [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
 W:     http://royale.zerezo.com/zr364xx/
 S:     Maintained
 
 USER-MODE LINUX
 P:     Jeff Dike
-M:     [EMAIL PROTECTED]
+M:     [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
 W:     http://user-mode-linux.sourceforge.net
 S:     Maintained
 
 FAT/VFAT/MSDOS FILESYSTEM:
@@ -4277,19 +4273,12 @@ ZR36067 VIDEO FOR LINUX DRIVER
 P:     Ronald Bultje
 M:     [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
 W:     http://mjpeg.sourceforge.net/driver-zoran/
 S:     Maintained
 
-ZR36120 VIDEO FOR LINUX DRIVER
-P:     Pauline Middelink
-M:     [EMAIL PROTECTED]
-W:     http://www.polyware.nl/~middelin/En/hobbies.html
-W:     http://www.polyware.nl/~middelin/hobbies.html
-S:     Maintained
-
 ZS DECSTATION Z85C30 SERIAL DRIVER
 P:     Maciej W. Rozycki
 M:     [EMAIL PROTECTED]
 S:     Maintained
 
 THE REST


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to