aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@maxwell.earthlink.net>2002-11-08 21:10:43 -0800
committerJames Simmons <jsimmons@maxwell.earthlink.net>2002-11-08 21:10:43 -0800
commit6dad4779aa0cf2faf5be8fffdc59ba7fc816e3eb (patch)
tree61b5155c741da227f474ca7fbe68435300536797 /CREDITS
parent5e88350d184351ea3f553448b518f5dd3d6890d2 (diff)
parent8574c79d672ae994ba4b3ac422cbde5968410ccd (diff)
downloadhistory-6dad4779aa0cf2faf5be8fffdc59ba7fc816e3eb.tar.gz
Auto merged except for parisc Kconfig. I have to sync by hand.
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS10
1 files changed, 10 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 398cc2967eebd1..b197b6fdf059fa 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2827,6 +2827,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