aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.ninka.net>2002-08-01 05:11:49 -0700
committerDavid S. Miller <davem@nuts.ninka.net>2002-08-01 05:11:49 -0700
commit009d4130ec4b1492c191aaa6c110212fb047626d (patch)
treeeea9f68c0fb4adb3cb27b85839a4555a4009cdd4 /CREDITS
parent856d8b52fe04b6870111eaace963ee3ebc692050 (diff)
parentcd03e0b97f3028d6c0701cfea09df6fdc8009813 (diff)
downloadhistory-009d4130ec4b1492c191aaa6c110212fb047626d.tar.gz
Merge nuts.ninka.net:/home/davem/src/BK/BAK-net-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS6
1 files changed, 6 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 976d5c1613d1ac..861f92e9c4f629 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1342,6 +1342,12 @@ S: 998 East 900 South, Suite 26
S: Provo, Utah 84606-5607
S: USA
+N: Marcel Holtmann
+E: marcel@holtmann.org
+W: http://www.holtmann.org
+D: Author of the Linux Bluetooth Subsystem PC Card drivers
+S: Germany
+
N: Rob W. W. Hooft
E: hooft@EMBL-Heidelberg.DE
D: Shared libs for graphics-tools and for the f2c compiler