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.

Gustavo F. Padovan 448f2627c1 Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 ... Conflicts: net/bluetooth/rfcomm/sock.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	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: Fix BT_L2CAP and BT_SCO in Kconfig	14 years ago
Makefile	Bluetooth: Merge L2CAP and SCO modules into bluetooth.ko	14 years ago
af_bluetooth.c	Bluetooth: remove unnecessary call to hci_sock_cleanup	14 years ago
hci_conn.c	Bluetooth: Simplify hci_conn_accept_secure check	14 years ago
hci_core.c	Bluetooth: Add BT_POWER L2CAP socket option.	14 years ago
hci_event.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6	14 years ago
hci_sock.c	Bluetooth: fix build break on hci_sock.c	14 years ago
hci_sysfs.c	Bluetooth: Add variable SSP auto-accept delay support	14 years ago
l2cap_core.c	Bluetooth: Fix check for the ERTM local busy state	14 years ago
l2cap_sock.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6	14 years ago
lib.c	Bluetooth: make batostr() print in the right order	15 years ago
mgmt.c	Bluetooth: Verify a pin code in pin_code_reply	14 years ago
sco.c	Bluetooth: fix shutdown on SCO sockets	14 years ago