aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2003-09-19 02:51:20 -0700
committerGreg Kroah-Hartman <greg@kroah.com>2003-09-19 02:51:20 -0700
commit4f3a1d592e8dc6d7327fc7ca915b9b764883d5b7 (patch)
treeb6ef05cf65c34bd38519aa84b7b86a16c1557eb4 /CREDITS
parent157e3d7042ddcc0aa7f32fb8a8b1dd2aeb1f562d (diff)
parent303d082c15dc71fd34e81b21d7b65216c8915a85 (diff)
downloadhistory-4f3a1d592e8dc6d7327fc7ca915b9b764883d5b7.tar.gz
Merge kroah.com:/home/linux/BK/bleed-2.5
into kroah.com:/home/linux/BK/gregkh-2.6
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 24d51d79b11396..78afcb7fff8e88 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2796,7 +2796,7 @@ E: gt8134b@prism.gatech.edu
D: Dosemu
N: Duncan Sands
-E: duncan.sands@wanadoo.fr
+E: duncan.sands@free.fr
W: http://topo.math.u-psud.fr/~sands
D: Alcatel SpeedTouch USB driver
S: 69 rue Dunois