summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorJamie Lokier <jamie@shareable.org>2006-03-25 03:07:53 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 08:22:57 -0800
commit6a5315b0e7fbc028f6e6443cf7fb67b5881e7fa3 (patch)
tree97b1e8871d60f53a4ebc062bf593a528f4fbf18a /CREDITS
parent5c98d29ae4d8cb0e2ce78b82b2c1957bcfd7dbd3 (diff)
downloadlinux-6a5315b0e7fbc028f6e6443cf7fb67b5881e7fa3.tar.gz
linux-6a5315b0e7fbc028f6e6443cf7fb67b5881e7fa3.tar.bz2
linux-6a5315b0e7fbc028f6e6443cf7fb67b5881e7fa3.zip
[PATCH] Remova long-incorrect address for Jamie Lokier
Nice place isn't it? I've lived in 7 other houses since then. Signed-off-by: Jamie Lokier <jamie@shareable.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS11
1 files changed, 6 insertions, 5 deletions
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