diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-19 01:33:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-19 01:33:25 -0700 |
| commit | d2805395aadc105d7228511eb0f42d9eea912003 (patch) | |
| tree | a97b491304831cfc809d1f3d1bcf5280b15bbe8d /net/bluetooth/l2cap.c | |
| parent | f3b9605d744df537dee10fd06630f35a62b343ec (diff) | |
| parent | 63fbd24e5102eecfc9d049ed7f4be7f9a25f814f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/l2cap.c')
| -rw-r--r-- | net/bluetooth/l2cap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index c1239852834..3396d5bdef1 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -2516,7 +2516,7 @@ EXPORT_SYMBOL(l2cap_load); module_init(l2cap_init); module_exit(l2cap_exit); -MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>"); +MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); MODULE_DESCRIPTION("Bluetooth L2CAP ver " VERSION); MODULE_VERSION(VERSION); MODULE_LICENSE("GPL"); |