aboutsummaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-04 13:23:40 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-04 13:23:40 -0400
commitfed3be9bd56e67c9b9324277b7f95c32e73a75bb (patch)
tree6f9c69bac0a9a9f295d14f427d6f01eac28d6c01 /CREDITS
parent5dea5176e5c32ef9f0d1a41d28427b3bf6881b3a (diff)
downloadlinux-2.6.34-ux500-fed3be9bd56e67c9b9324277b7f95c32e73a75bb.tar.gz
CREDITS file update (Tristan Greaves)
By request from Tristan. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS10
1 files changed, 2 insertions, 8 deletions
diff --git a/CREDITS b/CREDITS
index 787564bc248..6f50be37fa0 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: tmg296@ecs.soton.ac.uk
-W: http://www.ecs.soton.ac.uk/~tmg296
+E: tristan@extricate.org
+W: http://www.extricate.org/
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