Merge branch 'master'

[linux-2.6] / CREDITS

diff --git a/CREDITS b/CREDITS
index 9bf714a1c7d97e92a634161c3538ee93e30f07d3..3ebb93b2f7c85f57a3f255ffab710e491fea9942 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -3540,11 +3540,11 @@ S: Fargo, North Dakota 58122
 S: USA
 
 N: Steven Whitehouse
-E: SteveW@ACM.org
+E: steve@chygwyn.com
 W: http://www.chygwyn.com/~steve
-D: Linux DECnet project: http://www.sucs.swan.ac.uk/~rohan/DECnet/index.html
+D: Linux DECnet project
 D: Minor debugging of other networking protocols.
-D: Misc bug fixes and filesystem development
+D: Misc bug fixes and GFS2 filesystem development
 
 N: Hans-Joachim Widmaier
 E: hjw@zvw.de