Gustavo F. Padovan 448f2627c1 Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 ... Conflicts: net/bluetooth/rfcomm/sock.c		2011-06-09 16:33:54 -03: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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-05-23 09:10:03 -07: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
hci_conn.c	Bluetooth: Simplify hci_conn_accept_secure check	2011-06-08 16:58:19 -03:00
hci_core.c	Bluetooth: Add BT_POWER L2CAP socket option.	2011-06-08 16:58:19 -03:00
hci_event.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6	2011-06-09 16:33:54 -03:00
hci_sock.c
hci_sysfs.c	Bluetooth: Add variable SSP auto-accept delay support	2011-04-28 16:02:30 -03:00
Kconfig
l2cap_core.c	Bluetooth: Fix check for the ERTM local busy state	2011-06-08 16:58:19 -03:00
l2cap_sock.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6	2011-06-09 16:33:54 -03:00
lib.c
Makefile
mgmt.c	Bluetooth: Verify a pin code in pin_code_reply	2011-06-08 16:58:19 -03:00
sco.c	Bluetooth: fix shutdown on SCO sockets	2011-06-09 15:30:01 -03:00