Merge branch 'master' into gfs2

[linux-2.6-block.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index 66e82466dde8af73c814354d8e4df82398e78e5c..2aa8f6d41c2ff60abca66ef4e34af0407c7fe285 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -3550,11 +3550,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