X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=CREDITS;h=9bf714a1c7d97e92a634161c3538ee93e30f07d3;hb=612eff0e3715a6faff5ba1b74873b99e036c59fe;hp=6f50be37fa0f81dbcccd5929b0c92c4f59775dd6;hpb=936ef1d48ac9a9fc90746bacd93624969711775a;p=linux-2.6 diff --git a/CREDITS b/CREDITS index 6f50be37fa..9bf714a1c7 100644 --- a/CREDITS +++ b/CREDITS @@ -3241,14 +3241,9 @@ S: 12725 SW Millikan Way, Suite 400 S: Beaverton, Oregon 97005 S: USA -N: Marcelo W. Tosatti -E: marcelo.tosatti@cyclades.com -D: Miscellaneous kernel hacker +N: Marcelo Tosatti +E: marcelo@kvack.org D: v2.4 kernel maintainer -D: Current pc300/cyclades maintainer -S: Cyclades Corporation -S: Av Cristovao Colombo, 462. Floresta. -S: Porto Alegre S: Brazil N: Stefan Traby