aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMaksim Krasnyanskiy <maxk@qualcomm.com>2003-09-11 18:45:11 -0700
committerMaksim Krasnyanskiy <maxk@qualcomm.com>2003-09-11 18:45:11 -0700
commit5f7bc42ba73506292d91367ac3ec6b5b16e2b4db (patch)
tree83a3ed61c07d19bcb34c15273d6b33b4e3108e5f /CREDITS
parent7140df082aa676f0589c5d5a13f52c088f17d21a (diff)
parentc3dfa98513d4002d540821af276cf33a97407392 (diff)
downloadhistory-5f7bc42ba73506292d91367ac3ec6b5b16e2b4db.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 c4579bf756d8ae..a1481d91bb753f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1394,7 +1394,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