John W. Linville a70171dce9 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/libertas/if_cs.c
	drivers/net/wireless/rtlwifi/pci.c
	net/bluetooth/l2cap_sock.c

2011-05-05 13:32:35 -04:00

..

bnep

Bluetooth: Use kthread API in bnep

2011-04-05 12:40:47 -03:00

cmtp

Bluetooth: Move more channel info to struct l2cap_chan

2011-04-28 01:09:58 -03:00

hidp

Bluetooth: Move more channel info to struct l2cap_chan

2011-04-28 01:09:58 -03:00

rfcomm

Bluetooth: Move conn to struct l2cap_chan

2011-04-28 01:10:00 -03:00

af_bluetooth.c

Bluetooth: remove unnecessary call to hci_sock_cleanup

2011-02-25 22:36:58 -03:00

hci_conn.c

Bluetooth: Add variable SSP auto-accept delay support

2011-04-28 16:02:30 -03:00

hci_core.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2011-05-05 13:32:35 -04:00

hci_event.c

Bluetooth: Fix updating conn->auth_type in hci_io_capa_request_evt

2011-04-28 16:14:44 -03:00

hci_sock.c

Bluetooth: fix build break on hci_sock.c

2011-02-22 08:43:52 -03:00

hci_sysfs.c

Bluetooth: Add variable SSP auto-accept delay support

2011-04-28 16:02:30 -03:00

Kconfig

Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig

2011-02-28 14:06:53 -05:00

l2cap_core.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2011-05-05 13:32:35 -04:00

l2cap_sock.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2011-05-05 13:32:35 -04:00

lib.c

Bluetooth: make batostr() print in the right order

2010-10-12 12:44:52 -03:00

Makefile

Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko

2011-02-14 17:27:36 -03:00

mgmt.c

Bluetooth: Add store_hint parameter to mgmt_new_key

2011-04-28 16:14:43 -03:00

sco.c

Bluetooth: fix shutdown on SCO sockets

2011-04-18 20:11:46 -03:00