Merge branch 'from-linus' into upstream

author: John W. Linville <linville@tuxdriver.com> 2006-05-05 16:50:23 -0400
committer: John W. Linville <linville@tuxdriver.com> 2006-05-05 16:50:23 -0400
commit: aad61439e6a00bdb72cb649e11f6e166590c5f66 (patch)
tree: 2279f3c2a15f81526d14182c6acb358cafd0b359 /CREDITS
parent: 3c304956755fa63ee80ca51ce38078fe1c4e8818 (diff)
parent: d98550e334715b2d9e45f8f0f4e1608720108640 (diff)
1 files changed, 2 insertions, 8 deletions
diff --git a/CREDITS b/CREDITS
index 787564bc248b..6f50be37fa0f 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
author	John W. Linville <linville@tuxdriver.com>	2006-05-05 16:50:23 -0400
committer	John W. Linville <linville@tuxdriver.com>	2006-05-05 16:50:23 -0400
commit	aad61439e6a00bdb72cb649e11f6e166590c5f66 (patch)
tree	2279f3c2a15f81526d14182c6acb358cafd0b359 /CREDITS
parent	3c304956755fa63ee80ca51ce38078fe1c4e8818 (diff)
parent	d98550e334715b2d9e45f8f0f4e1608720108640 (diff)

diff --git a/CREDITS b/CREDITS index 787564bc248b..6f50be37fa0f 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