aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMaksim Krasnyanskiy <maxk@qualcomm.com>2003-08-06 03:36:22 -0700
committerMaksim Krasnyanskiy <maxk@qualcomm.com>2003-08-06 03:36:22 -0700
commit575bad463f0a46e5563276154ebc45670229a101 (patch)
treeaebb18075a4bf5ad3a8f0c747b251cf215942b1e /CREDITS
parentdefec5af59ff9a04902a2d716ac8dca7c16d32a6 (diff)
parent600c3719f28d502bcc351d99f0b25ee4b009b3e3 (diff)
downloadhistory-575bad463f0a46e5563276154ebc45670229a101.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 29291aee15f7bf..391f2db81dd21e 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