John W. Linville d859898114 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ... Conflicts: drivers/net/wireless/ath/ath5k/sysfs.c net/bluetooth/l2cap_core.c net/mac80211/wpa.c		2011-07-11 14:46:59 -04:00
..
bnep	Bluetooth: Use kthread API in bnep	2011-04-05 12:40:47 -03:00
cmtp	Bluetooth: Kill set but unused variable 'cmd' in cmtp_recv_capimsg()	2011-06-09 16:32:21 -03:00
hidp	Bluetooth: Fix hidp disconnect deadlocks and lost wakeup	2011-06-30 15:47:50 -03:00
rfcomm	Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6	2011-06-09 16:33:54 -03:00
af_bluetooth.c	Bluetooth: remove unnecessary call to hci_sock_cleanup	2011-02-25 22:36:58 -03:00
hci_conn.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-07-11 14:46:59 -04:00
hci_core.c	Bluetooth: Fix locking in blacklist code	2011-06-17 16:15:10 -03:00
hci_event.c	Bluetooth: Add support for Pairing features exchange	2011-06-13 16:05:37 -03:00
hci_sock.c	Bluetooth: Move blacklisting functions to hci_core	2011-06-16 15:19:41 -03:00
hci_sysfs.c	Bluetooth: Add variable SSP auto-accept delay support	2011-04-28 16:02:30 -03:00
Kconfig	bluetooth: uses crypto interfaces, select CRYPTO	2011-06-27 15:09:39 -04:00
l2cap_core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-07-11 14:46:59 -04:00
l2cap_sock.c	Bluetooth: use bit operation on conf_state	2011-06-16 18:57:14 -03:00
lib.c	Bluetooth: make batostr() print in the right order	2010-10-12 12:44:52 -03:00
Makefile	Bluetooth: Implement the first SMP commands	2011-06-13 15:11:55 -03:00
mgmt.c	Bluetooth: Add blacklisting support for mgmt interface	2011-06-16 18:57:04 -03:00
sco.c	Bluetooth: fix shutdown on SCO sockets	2011-06-10 15:04:40 -03:00
smp.c	Bluetooth: include scatterlist.h where needed	2011-06-24 15:08:48 -04:00