linux/net/bluetooth
David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-11-26 23:42:21 -05:00
..
bnep net: remove MTU limits on a few ether_setup callers 2016-10-21 13:57:50 -04:00
cmtp
hidp
rfcomm Bluetooth: Fix using the correct source address type 2016-11-22 22:50:46 +01:00
6lowpan.c Bluetooth: Fix using the correct source address type 2016-11-22 22:50:46 +01:00
a2mp.c
a2mp.h
af_bluetooth.c Bluetooth: Use numbers for subsystem version string 2016-09-19 20:19:34 +02:00
amp.c
amp.h
ecc.c
ecc.h
hci_conn.c Bluetooth: Fix using the correct source address type 2016-11-22 22:50:46 +01:00
hci_core.c Bluetooth: Fix wrong New Settings event when closing HCI User Channel 2016-09-19 20:19:34 +02:00
hci_debugfs.c
hci_debugfs.h
hci_event.c
hci_request.c Bluetooth: Fix append max 11 bytes of name to scan rsp data 2016-10-19 18:42:37 +02:00
hci_request.h Bluetooth: Fix append max 11 bytes of name to scan rsp data 2016-10-19 18:42:37 +02:00
hci_sock.c Bluetooth: Send control open and close messages for HCI user channels 2016-09-19 20:19:34 +02:00
hci_sysfs.c
Kconfig
l2cap_core.c Bluetooth: Fix using the correct source address type 2016-11-22 22:50:46 +01:00
l2cap_sock.c
leds.c
leds.h
lib.c
Makefile
mgmt_util.c Bluetooth: Add support for sending MGMT commands and events to monitor 2016-09-19 20:19:34 +02:00
mgmt_util.h
mgmt.c Bluetooth: Fix append max 11 bytes of name to scan rsp data 2016-10-19 18:42:37 +02:00
sco.c Bluetooth: Fix using the correct source address type 2016-11-22 22:50:46 +01:00
selftest.c
selftest.h
smp.c Bluetooth: Fix not registering BR/EDR SMP channel with force_bredr flag 2016-09-19 20:19:34 +02:00
smp.h