X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=CREDITS;h=c6d69bf10e1513cf366ffe7e576ddb519433f869;hb=c163c7293eb68bf6c0c824d122a2192b9f129193;hp=af70678a0afdf95ef720e7b35202eda1323a68c9;hpb=ec1248e70edc5cf7b485efcc7b41e44e10f422e5;p=sfrench%2Fcifs-2.6.git

diff --git a/CREDITS b/CREDITS
index af70678a0afd..c6d69bf10e15 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2007,13 +2007,14 @@ S: University of Stuttgart, Germany and
 S: Ecole Nationale Superieure des Telecommunications, Paris
 
 N: Jamie Lokier
-E: jamie@imbolc.ucc.ie
+E: jamie@shareable.org
+W: http://www.shareable.org/
 D: Reboot-through-BIOS for broken 486 motherboards
-D: Some parport fixes
-S: 11 Goodson Walk
-S: Marston
+D: Parport fixes, futex improvements
+D: First instruction of x86 sysenter path :)
+S: 51 Sunningwell Road
 S: Oxford
-S: OX3 0HX
+S: OX1 4SZ
 S: United Kingdom
 
 N: Mark Lord