John W. Linville a5eb1aeb25 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next ...

Conflicts:
	drivers/bluetooth/btusb.c

2014-05-29 13:03:47 -04:00

..

bnep

…

cmtp

…

hidp

Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus

2014-04-01 19:05:09 +02:00

rfcomm

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2014-05-29 13:03:47 -04:00

6lowpan.c

…

6lowpan.h

…

a2mp.c

…

a2mp.h

…

af_bluetooth.c

…

amp.c

…

amp.h

…

hci_conn.c

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2014-05-29 13:03:47 -04:00

hci_core.c

Bluetooth: Make SMP context private to smp.c

2014-05-20 08:44:11 -07:00

hci_event.c

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2014-05-29 13:03:47 -04:00

hci_sock.c

Bluetooth: Return EOPNOTSUPP for HCISETRAW ioctl command

2014-04-24 11:55:25 -03:00

hci_sysfs.c

…

Kconfig

…

l2cap_core.c

Bluetooth: Fix L2CAP LE debugfs entries permissions

2014-05-14 09:07:07 -07:00

l2cap_sock.c

net: Fix use after free by removing length arg from sk_data_ready callbacks.

2014-04-11 16:15:36 -04:00

lib.c

Bluetooth: Add error mapping for Directed Advertising Timeout

2014-03-26 09:31:36 -07:00

Makefile

…

mgmt.c

Bluetooth: Clearly distinguish mgmt LTK type from authenticated property

2014-05-23 11:24:04 -07:00

sco.c

net: Fix use after free by removing length arg from sk_data_ready callbacks.

2014-04-11 16:15:36 -04:00

smp.c

Bluetooth: Update smp_confirm to return a response code

2014-05-20 08:44:14 -07:00

smp.h

Bluetooth: Make SMP context private to smp.c

2014-05-20 08:44:11 -07:00