aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMaksim Krasnyanskiy <maxk@qualcomm.com>2003-08-15 03:16:54 -0700
committerMaksim Krasnyanskiy <maxk@qualcomm.com>2003-08-15 03:16:54 -0700
commit7f3ae704aa21b8f406dc87ac819327252f61fe25 (patch)
treedfa2f42de8c38ced2cd0ee7ca5b119c8777448f6 /CREDITS
parenta1ad3d823549923ee72310496e463ed0081c0f6b (diff)
parent575bad463f0a46e5563276154ebc45670229a101 (diff)
downloadhistory-7f3ae704aa21b8f406dc87ac819327252f61fe25.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 332dc225d28fa1..aea888da34053b 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