diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 10:54:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 10:54:07 +0200 |
| commit | e4f807c2b4d81636fc63993368646c5bfd42b22f (patch) | |
| tree | 2ff100911b1ba4e26e3d9aad41edb9b48405f01e /net/bluetooth/rfcomm/core.c | |
| parent | 25258ef762bc4a05fa9c4523f7dae56e3fd01864 (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
| download | linux-stable-e4f807c2b4d81636fc63993368646c5bfd42b22f.tar.gz linux-stable-e4f807c2b4d81636fc63993368646c5bfd42b22f.tar.bz2 linux-stable-e4f807c2b4d81636fc63993368646c5bfd42b22f.zip | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/paravirt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/bluetooth/rfcomm/core.c')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 6cfc7ba611b3..ba537fae0a4c 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -2115,7 +2115,7 @@ MODULE_PARM_DESC(channel_mtu, "Default MTU for the RFCOMM channel"); module_param(l2cap_mtu, uint, 0644); MODULE_PARM_DESC(l2cap_mtu, "Default MTU for the L2CAP connection"); -MODULE_AUTHOR("Maxim Krasnyansky <maxk@qualcomm.com>, Marcel Holtmann <marcel@holtmann.org>"); +MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); MODULE_DESCRIPTION("Bluetooth RFCOMM ver " VERSION); MODULE_VERSION(VERSION); MODULE_LICENSE("GPL"); |