Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=926554c4b74e53d5da4cefdc3bbd7e92427fb1a9
Commit:     926554c4b74e53d5da4cefdc3bbd7e92427fb1a9
Parent:     1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d
Author:     Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
AuthorDate: Sat Mar 31 12:05:49 2007 -0300
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 25 22:28:31 2007 -0700

    [CREDITS]: Update Arnaldo entry
    
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
---
 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 PROTECTED]
 E: [EMAIL PROTECTED]
+E: [EMAIL PROTECTED]
+E: [EMAIL PROTECTED]
 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 277877a..ab258c7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -384,7 +384,7 @@ S:  Supported
 
 APPLETALK NETWORK LAYER
 P:     Arnaldo Carvalho de Melo
-M:     [EMAIL PROTECTED]
+M:     [EMAIL PROTECTED]
 S:     Maintained
 
 ARC FRAMEBUFFER DRIVER
@@ -1034,9 +1034,8 @@ S:        Maintained
 
 CYCLADES 2X SYNC CARD DRIVER
 P:     Arnaldo Carvalho de Melo
-M:     [EMAIL PROTECTED]
-W:     http://advogato.org/person/acme
-L:     [EMAIL PROTECTED]
+M:     [EMAIL PROTECTED]
+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:     [EMAIL PROTECTED]
+M:     [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
 W:     http://linux-net.osdl.org/index.php/DCCP
 S:     Maintained
@@ -1871,7 +1870,7 @@ S:        Supported
 
 IPX NETWORK LAYER
 P:     Arnaldo Carvalho de Melo
-M:     [EMAIL PROTECTED]
+M:     [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
 S:     Maintained
 
@@ -2108,7 +2107,7 @@ S:        Supported
 
 LLC (802.2)
 P:     Arnaldo Carvalho de Melo
-M:     [EMAIL PROTECTED]
+M:     [EMAIL PROTECTED]
 S:     Maintained
 
 LINUX FOR 64BIT POWERPC
@@ -3766,8 +3765,8 @@ S:        Maintained
 
 WL3501 WIRELESS PCMCIA CARD DRIVER
 P:     Arnaldo Carvalho de Melo
-M:     [EMAIL PROTECTED]
-W:     http://advogato.org/person/acme
+M:     [EMAIL PROTECTED]
+W:     http://oops.ghostprotocols.net:81/blog
 S:     Maintained
 
 X.25 NETWORK LAYER
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to