aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@ghostprotocols.net>2007-03-31 11:05:49 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:28:31 -0400
commit926554c4b74e53d5da4cefdc3bbd7e92427fb1a9 (patch)
treebd158886f56de279b69287b1402166812abb2b86
parent1a4e2d093fd5f3eaf8cffc04a1b803f8b0ddef6d (diff)
[CREDITS]: Update Arnaldo entry
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
-rw-r--r--CREDITS8
-rw-r--r--MAINTAINERS17
2 files changed, 12 insertions, 13 deletions
diff --git a/CREDITS b/CREDITS
index 6bd8ab86b5bd..e3e7271ace0c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2286,14 +2286,14 @@ S: D-90453 Nuernberg
2286S: Germany 2286S: Germany
2287 2287
2288N: Arnaldo Carvalho de Melo 2288N: Arnaldo Carvalho de Melo
2289E: acme@mandriva.com
2290E: acme@ghostprotocols.net 2289E: acme@ghostprotocols.net
2290E: arnaldo.melo@gmail.com
2291E: acme@redhat.com
2291W: http://oops.ghostprotocols.net:81/blog/ 2292W: http://oops.ghostprotocols.net:81/blog/
2292P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01 2293P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
2293D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks 2294D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
2294S: Mandriva 2295S: R. Brasílio Itiberê, 4270/1010 - Água Verde
2295S: R. Tocantins, 89 - Cristo Rei 2296S: 80240-060 - Curitiba - Paraná
2296S: 80050-430 - Curitiba - Paraná
2297S: Brazil 2297S: Brazil
2298 2298
2299N: Karsten Merker 2299N: Karsten Merker
diff --git a/MAINTAINERS b/MAINTAINERS
index 277877a34ef6..ab258c7f46ac 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -384,7 +384,7 @@ S: Supported
384 384
385APPLETALK NETWORK LAYER 385APPLETALK NETWORK LAYER
386P: Arnaldo Carvalho de Melo 386P: Arnaldo Carvalho de Melo
387M: acme@conectiva.com.br 387M: acme@ghostprotocols.net
388S: Maintained 388S: Maintained
389 389
390ARC FRAMEBUFFER DRIVER 390ARC FRAMEBUFFER DRIVER
@@ -1034,9 +1034,8 @@ S: Maintained
1034 1034
1035CYCLADES 2X SYNC CARD DRIVER 1035CYCLADES 2X SYNC CARD DRIVER
1036P: Arnaldo Carvalho de Melo 1036P: Arnaldo Carvalho de Melo
1037M: acme@conectiva.com.br 1037M: acme@ghostprotocols.net
1038W: http://advogato.org/person/acme 1038W: http://oops.ghostprotocols.net:81/blog
1039L: cycsyn-devel@bazar.conectiva.com.br
1040S: Maintained 1039S: Maintained
1041 1040
1042CYCLADES ASYNC MUX DRIVER 1041CYCLADES ASYNC MUX DRIVER
@@ -1077,7 +1076,7 @@ S: Maintained
1077 1076
1078DCCP PROTOCOL 1077DCCP PROTOCOL
1079P: Arnaldo Carvalho de Melo 1078P: Arnaldo Carvalho de Melo
1080M: acme@mandriva.com 1079M: acme@ghostprotocols.net
1081L: dccp@vger.kernel.org 1080L: dccp@vger.kernel.org
1082W: http://linux-net.osdl.org/index.php/DCCP 1081W: http://linux-net.osdl.org/index.php/DCCP
1083S: Maintained 1082S: Maintained
@@ -1871,7 +1870,7 @@ S: Supported
1871 1870
1872IPX NETWORK LAYER 1871IPX NETWORK LAYER
1873P: Arnaldo Carvalho de Melo 1872P: Arnaldo Carvalho de Melo
1874M: acme@conectiva.com.br 1873M: acme@ghostprotocols.net
1875L: netdev@vger.kernel.org 1874L: netdev@vger.kernel.org
1876S: Maintained 1875S: Maintained
1877 1876
@@ -2108,7 +2107,7 @@ S: Supported
2108 2107
2109LLC (802.2) 2108LLC (802.2)
2110P: Arnaldo Carvalho de Melo 2109P: Arnaldo Carvalho de Melo
2111M: acme@conectiva.com.br 2110M: acme@ghostprotocols.net
2112S: Maintained 2111S: Maintained
2113 2112
2114LINUX FOR 64BIT POWERPC 2113LINUX FOR 64BIT POWERPC
@@ -3766,8 +3765,8 @@ S: Maintained
3766 3765
3767WL3501 WIRELESS PCMCIA CARD DRIVER 3766WL3501 WIRELESS PCMCIA CARD DRIVER
3768P: Arnaldo Carvalho de Melo 3767P: Arnaldo Carvalho de Melo
3769M: acme@conectiva.com.br 3768M: acme@ghostprotocols.net
3770W: http://advogato.org/person/acme 3769W: http://oops.ghostprotocols.net:81/blog
3771S: Maintained 3770S: Maintained
3772 3771
3773X.25 NETWORK LAYER 3772X.25 NETWORK LAYER