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.

John W. Linville 36099365c7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ... Conflicts: drivers/net/wireless/rtlwifi/pci.c include/linux/netlink.h		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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	14 years ago
rfcomm	Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6	14 years ago
Kconfig	Bluetooth: Add support for using the crypto subsystem	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 master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-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 Pairing features exchange	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	Bluetooth: Fix not setting the chan state	14 years ago
l2cap_sock.c	Bluetooth: use bit operation on conf_state	14 years ago
lib.c	Bluetooth: make batostr() print in the right order	15 years ago
mgmt.c	Bluetooth: Add blacklisting support for mgmt interface	14 years ago
sco.c	Bluetooth: fix shutdown on SCO sockets	14 years ago
smp.c	Bluetooth: include scatterlist.h where needed	14 years ago