[CREDITS]: Update Arnaldo entry

[net-next-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6722c3760b69d6c40d4f2f4db883a721ac5afcbc..ab258c7f46ac49bca527b64cc40c7bac6e4c5216 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -384,7 +384,7 @@ S:  Supported
 
 APPLETALK NETWORK LAYER
 P:     Arnaldo Carvalho de Melo
-M:     acme@conectiva.com.br
+M:     acme@ghostprotocols.net
 S:     Maintained
 
 ARC FRAMEBUFFER DRIVER
@@ -1034,9 +1034,8 @@ S:        Maintained
 
 CYCLADES 2X SYNC CARD DRIVER
 P:     Arnaldo Carvalho de Melo
-M:     acme@conectiva.com.br
-W:     http://advogato.org/person/acme
-L:     cycsyn-devel@bazar.conectiva.com.br
+M:     acme@ghostprotocols.net
+W:     http://oops.ghostprotocols.net:81/blog
 S:     Maintained
 
 CYCLADES ASYNC MUX DRIVER
@@ -1077,7 +1076,7 @@ S:        Maintained
 
 DCCP PROTOCOL
 P:     Arnaldo Carvalho de Melo
-M:     acme@mandriva.com
+M:     acme@ghostprotocols.net
 L:     dccp@vger.kernel.org
 W:     http://linux-net.osdl.org/index.php/DCCP
 S:     Maintained
@@ -1355,6 +1354,11 @@ M:       kevin.curtis@farsite.co.uk
 W:     http://www.farsite.co.uk/
 S:     Supported
 
+FAULT INJECTION SUPPORT
+P:     Akinobu Mita
+M:     akinobu.mita@gmail.com
+S:     Supported
+
 FRAMEBUFFER LAYER
 P:     Antonino Daplas
 M:     adaplas@gmail.com
@@ -1866,7 +1870,7 @@ S:        Supported
 
 IPX NETWORK LAYER
 P:     Arnaldo Carvalho de Melo
-M:     acme@conectiva.com.br
+M:     acme@ghostprotocols.net
 L:     netdev@vger.kernel.org
 S:     Maintained
 
@@ -2103,7 +2107,7 @@ S:        Supported
 
 LLC (802.2)
 P:     Arnaldo Carvalho de Melo
-M:     acme@conectiva.com.br
+M:     acme@ghostprotocols.net
 S:     Maintained
 
 LINUX FOR 64BIT POWERPC
@@ -3761,8 +3765,8 @@ S:        Maintained
 
 WL3501 WIRELESS PCMCIA CARD DRIVER
 P:     Arnaldo Carvalho de Melo
-M:     acme@conectiva.com.br
-W:     http://advogato.org/person/acme
+M:     acme@ghostprotocols.net
+W:     http://oops.ghostprotocols.net:81/blog
 S:     Maintained
 
 X.25 NETWORK LAYER