aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMaksim Krasnyanskiy <maxk@qualcomm.com>2003-08-23 01:45:24 -0700
committerMaksim Krasnyanskiy <maxk@qualcomm.com>2003-08-23 01:45:24 -0700
commit6e21ae5b2c353b8075da20c3b7484dbd54bff66e (patch)
tree9a3a742a66a07d95576a3210c19c1ee03aa88668 /CREDITS
parent6cf7367489c7b055b6e02519de29d48c9ef238bb (diff)
parenta17a125ced08da801ef2a219819b8ebfc6af35b5 (diff)
downloadhistory-6e21ae5b2c353b8075da20c3b7484dbd54bff66e.tar.gz
Merge bk://linux.bkbits.net/linux-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 02ac236d12d37d..00cecac6fba404 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1387,7 +1387,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