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
+D: Parport fixes, futex improvements
-S: 11 Goodson Walk
+D: First instruction of x86 sysenter path :)
-S: Marston
+S: 51 Sunningwell Road
 S: Oxford
-S: OX3 0HX
+S: OX1 4SZ
 S: United Kingdom
 N: Mark Lord

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