Merge ../linux-2.6

author: James Bottomley <jejb@mulgrave.il.steeleye.com> 2006-06-10 14:47:26 -0400
committer: James Bottomley <jejb@mulgrave.il.steeleye.com> 2006-06-10 14:47:26 -0400
commit: f0cd91a68acdc9b49d7f6738b514a426da627649 (patch)
tree: 8ad73564015794197583b094217ae0a71e71e753 /CREDITS
parent: 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff)
parent: 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff)
1 files changed, 4 insertions, 15 deletions
diff --git a/CREDITS b/CREDITS
index 787564bc248b..9bf714a1c7d9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1194,15 +1194,9 @@ S: Brecksville, OH  44141-1334
 S: USA
 N: Tristan Greaves
-E: Tristan.Greaves@icl.com
+E: tristan@extricate.org
-E: tmg296@ecs.soton.ac.uk
+W: http://www.extricate.org/
-W: http://www.ecs.soton.ac.uk/~tmg296
 D: Miscellaneous ipv4 sysctl patches
-S: 15 Little Mead
-S: Denmead
-S: Hampshire
-S: PO7 6HS
-S: United Kingdom
 N: Michael A. Griffith
 E: grif@cs.ucr.edu
@@ -3247,14 +3241,9 @@ S: 12725 SW Millikan Way, Suite 400
 S: Beaverton, Oregon 97005
 S: USA
-N: Marcelo W. Tosatti
+N: Marcelo Tosatti
-E: marcelo.tosatti@cyclades.com
+E: marcelo@kvack.org
-D: Miscellaneous kernel hacker
 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
author	James Bottomley <jejb@mulgrave.il.steeleye.com>	2006-06-10 14:47:26 -0400
committer	James Bottomley <jejb@mulgrave.il.steeleye.com>	2006-06-10 14:47:26 -0400
commit	f0cd91a68acdc9b49d7f6738b514a426da627649 (patch)
tree	8ad73564015794197583b094217ae0a71e71e753 /CREDITS
parent	60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff)
parent	128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff)

diff --git a/CREDITS b/CREDITS index 787564bc248b..9bf714a1c7d9 100644 --- a/CREDITS +++ b/CREDITS
@@ -1194,15 +1194,9 @@ S: Brecksville, OH 44141-1334
1194	S: USA	1194	S: USA
1195		1195
1196	N: Tristan Greaves	1196	N: Tristan Greaves
1197	E: Tristan.Greaves@icl.com	1197	E: tristan@extricate.org
1198	E: tmg296@ecs.soton.ac.uk	1198	W: http://www.extricate.org/
1199	W: http://www.ecs.soton.ac.uk/~tmg296
1200	D: Miscellaneous ipv4 sysctl patches	1199	D: Miscellaneous ipv4 sysctl patches
1201	S: 15 Little Mead
1202	S: Denmead
1203	S: Hampshire
1204	S: PO7 6HS
1205	S: United Kingdom
1206		1200
1207	N: Michael A. Griffith	1201	N: Michael A. Griffith
1208	E: grif@cs.ucr.edu	1202	E: grif@cs.ucr.edu
@@ -3247,14 +3241,9 @@ S: 12725 SW Millikan Way, Suite 400
3247	S: Beaverton, Oregon 97005	3241	S: Beaverton, Oregon 97005
3248	S: USA	3242	S: USA
3249		3243
3250	N: Marcelo W. Tosatti	3244	N: Marcelo Tosatti
3251	E: marcelo.tosatti@cyclades.com	3245	E: marcelo@kvack.org
3252	D: Miscellaneous kernel hacker
3253	D: v2.4 kernel maintainer	3246	D: v2.4 kernel maintainer
3254	D: Current pc300/cyclades maintainer
3255	S: Cyclades Corporation
3256	S: Av Cristovao Colombo, 462. Floresta.
3257	S: Porto Alegre
3258	S: Brazil	3247	S: Brazil
3259		3248
3260	N: Stefan Traby	3249	N: Stefan Traby