X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=CREDITS;h=1d35f10ec3b2e51e984bf33e1bc4790c0c596417;hb=38e13929c391e6964b00840b765ed601a3377d33;hp=6f50be37fa0f81dbcccd5929b0c92c4f59775dd6;hpb=877fbae3d51ba792639535bfc0f428154b8da605;p=linux-2.6 diff --git a/CREDITS b/CREDITS index 6f50be37fa..1d35f10ec3 100644 --- a/CREDITS +++ b/CREDITS @@ -1573,12 +1573,8 @@ S: 160 00 Praha 6 S: Czech Republic N: Niels Kristian Bech Jensen -E: nkbj@image.dk -W: http://www.image.dk/~nkbj +E: nkbj1970@hotmail.com D: Miscellaneous kernel updates and fixes. -S: Dr. Holsts Vej 34, lejl. 164 -S: DK-8230 Åbyhøj -S: Denmark N: Michael K. Johnson E: johnsonm@redhat.com @@ -3241,14 +3237,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