You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 033b1142f4 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/bluetooth/l2cap_core.c		14 years ago
..
bnep	Bluetooth: Use kthread API in bnep	14 years ago
cmtp	Bluetooth: Kill set but unused variable 'cmd' in cmtp_recv_capimsg()	14 years ago
hidp	Bluetooth: Fix hidp disconnect deadlocks and lost wakeup	14 years ago
rfcomm	Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6	14 years ago
Kconfig	bluetooth: uses crypto interfaces, select CRYPTO	14 years ago
Makefile	Bluetooth: Implement the first SMP commands	14 years ago
af_bluetooth.c	Bluetooth: remove unnecessary call to hci_sock_cleanup	14 years ago
hci_conn.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	14 years ago
hci_core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	14 years ago
hci_event.c	Bluetooth: Add support for storing the key size	14 years ago
hci_sock.c	Bluetooth: Move blacklisting functions to hci_core	14 years ago
hci_sysfs.c	Bluetooth: Add variable SSP auto-accept delay support	14 years ago
l2cap_core.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	14 years ago
l2cap_sock.c	Bluetooth: Add support for returning the encryption key size	14 years ago
lib.c	Bluetooth: Add bt_printk	14 years ago
mgmt.c	Bluetooth: Add support for storing the key size	14 years ago
sco.c	Bluetooth: Rename function bt_err to bt_to_errno	14 years ago
smp.c	Bluetooth: Add support for storing the key size	14 years ago