aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Lokier <jamie@shareable.org>2006-03-25 06:07:53 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 11:22:57 -0500
commit6a5315b0e7fbc028f6e6443cf7fb67b5881e7fa3 (patch)
tree97b1e8871d60f53a4ebc062bf593a528f4fbf18a
parent5c98d29ae4d8cb0e2ce78b82b2c1957bcfd7dbd3 (diff)
[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>
-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
2007S: Ecole Nationale Superieure des Telecommunications, Paris 2007S: Ecole Nationale Superieure des Telecommunications, Paris
2008 2008
2009N: Jamie Lokier 2009N: Jamie Lokier
2010E: jamie@imbolc.ucc.ie 2010E: jamie@shareable.org
2011W: http://www.shareable.org/
2011D: Reboot-through-BIOS for broken 486 motherboards 2012D: Reboot-through-BIOS for broken 486 motherboards
2012D: Some parport fixes 2013D: Parport fixes, futex improvements
2013S: 11 Goodson Walk 2014D: First instruction of x86 sysenter path :)
2014S: Marston 2015S: 51 Sunningwell Road
2015S: Oxford 2016S: Oxford
2016S: OX3 0HX 2017S: OX1 4SZ
2017S: United Kingdom 2018S: United Kingdom
2018 2019
2019N: Mark Lord 2020N: Mark Lord