aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMaksim Krasnyanskiy <maxk@qualcomm.com>2003-07-14 23:42:19 -0700
committerMaksim Krasnyanskiy <maxk@qualcomm.com>2003-07-14 23:42:19 -0700
commit41979f5021f71a76c7427ab1509a5f871a86345f (patch)
tree649800598794780064c2edb1b69a1a81fbae71be /CREDITS
parent2157c296974209741271e59f13589eb5f4e524d8 (diff)
parent06e15cb52899320cb431a0800b872dc84048799c (diff)
downloadhistory-41979f5021f71a76c7427ab1509a5f871a86345f.tar.gz
Merge bk://linux-bt.bkbits.net/marcel-2.5
into qualcomm.com:/home/kernel/bt-2.5
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS3
1 files changed, 2 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 81f244e5ab8f1e..b6f3bac58b55e0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1384,7 +1384,8 @@ S: USA
N: Marcel Holtmann
E: marcel@holtmann.org
W: http://www.holtmann.org
-D: Author of the Linux Bluetooth Subsystem PC Card drivers
+D: Author and maintainer of the various Bluetooth HCI drivers
+D: Various other Bluetooth related patches, cleanups and fixes
S: Germany
N: Rob W. W. Hooft