Subject: [PATCH 3/3] [CREDITS]: Update Arnaldo entry

From: Arnaldo Carvalho de Melo <[email-masked]>
Date: Sat, 31 Mar 2007 12:14:59 -0300

Signed-off-by: Arnaldo Carvalho de Melo <[email-masked]>
---
 CREDITS     |    8 ++++----
 MAINTAINERS |   17 ++++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/CREDITS b/CREDITS
index 6bd8ab8..e3e7271 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2286,14 +2286,14 @@ S: D-90453 Nuernberg
 S: Germany
 
 N: Arnaldo Carvalho de Melo
-E: [email-masked]
 E: [email-masked]
+E: [email-masked]
+E: [email-masked]
 W: http://oops.ghostprotocols.net:81/blog/
 P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01
 D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
-S: Mandriva
-S: R. Tocantins, 89 - Cristo Rei
-S: 80050-430 - Curitiba - Paraná
+S: R. Brasílio Itiberê, 4270/1010 - Água Verde
+S: 80240-060 - Curitiba - Paraná
 S: Brazil
 
 N: Karsten Merker
diff --git a/MAINTAINERS b/MAINTAINERS
index 8c8090e..35b3456 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -369,7 +369,7 @@ S:	Supported
 
 APPLETALK NETWORK LAYER
 P:	Arnaldo Carvalho de Melo
-M:	[email-masked]
+M:	[email-masked]
 S:	Maintained
 
 ARC FRAMEBUFFER DRIVER
@@ -1019,9 +1019,8 @@ S:	Maintained
 
 CYCLADES 2X SYNC CARD DRIVER
 P:	Arnaldo Carvalho de Melo
-M:	[email-masked]
-W:	http://advogato.org/person/acme
-L:	[email-masked]
+M:	[email-masked]
+W:	http://oops.ghostprotocols.net:81/blog
 S:	Maintained
 
 CYCLADES ASYNC MUX DRIVER
@@ -1062,7 +1061,7 @@ S:	Maintained
 
 DCCP PROTOCOL
 P:	Arnaldo Carvalho de Melo
-M:	[email-masked]
+M:	[email-masked]
 L:	[email-masked]
 W:	http://linux-net.osdl.org/index.php/DCCP
 S:	Maintained
@@ -1865,7 +1864,7 @@ S:	Supported
 
 IPX NETWORK LAYER
 P:	Arnaldo Carvalho de Melo
-M:	[email-masked]
+M:	[email-masked]
 L:	[email-masked]
 S:	Maintained
 
@@ -2102,7 +2101,7 @@ S:	Supported
 
 LLC (802.2)
 P:	Arnaldo Carvalho de Melo
-M:	[email-masked]
+M:	[email-masked]
 S:	Maintained
 
 LINUX FOR 64BIT POWERPC
@@ -3760,8 +3759,8 @@ S:	Maintained
 
 WL3501 WIRELESS PCMCIA CARD DRIVER
 P:	Arnaldo Carvalho de Melo
-M:	[email-masked]
-W:	http://advogato.org/person/acme
+M:	[email-masked]
+W:	http://oops.ghostprotocols.net:81/blog
 S:	Maintained
 
 X.25 NETWORK LAYER
-- 
1.5.0.5