aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@maxwell.earthlink.net>2002-12-09 00:03:32 -0800
committerJames Simmons <jsimmons@maxwell.earthlink.net>2002-12-09 00:03:32 -0800
commitcf02c7e46aae7dbbaf5a3c5008490a1d987795c1 (patch)
tree11aabfdfefc7875b4407813d90cfdd78b770c5e7 /CREDITS
parente77a09cd87252cc11aa7f1b6c7f1fffd38b32c92 (diff)
parente94cf6939467efc484d2c4d90ff1d1a429a0b041 (diff)
downloadhistory-cf02c7e46aae7dbbaf5a3c5008490a1d987795c1.tar.gz
Merge maxwell.earthlink.net:/usr/src/linus-2.5
into maxwell.earthlink.net:/usr/src/fbdev-2.5
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS10
1 files changed, 10 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index dad95acd28a0d3..f3b17f04a4a7bc 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2843,6 +2843,16 @@ S: Klosterweg 28 / i309
S: 76131 Karlsruhe
S: Germany
+N: James Simmons
+E: jsimmons@users.sf.net
+D: Frame buffer device maintainer
+D: input layer developement
+D: tty/console layer
+D: various mipsel devices
+S: 115 Carmel Avenue
+S: El Cerrito CA 94530
+S: USA
+
N: Jaspreet Singh
E: jaspreet@sangoma.com
W: www.sangoma.com