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	Bluetooth: use list_for_each_entry*	2015-12-20 08:11:10 +01:00
hidp	Bluetooth: hidp: fix device disconnect on idle timeout	2015-10-21 00:49:23 +02:00
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	Bluetooth: Move get info completed callback to a2mp.c	2015-07-30 13:37:22 +02:00
a2mp.h	Bluetooth: Add BT_HS config option	2015-07-30 13:31:59 +02:00
af_bluetooth.c	Bluetooth: Use numbers for subsystem version string	2016-09-19 20:19:34 +02:00
amp.c	Bluetooth: Fix breakage in amp_write_rem_assoc_frag()	2015-08-10 20:41:34 +02:00
amp.h	Bluetooth: Add BT_HS config option	2015-07-30 13:31:59 +02:00
ecc.c	Bluetooth: Add ECC library for LE Secure Connections	2014-12-03 16:51:16 +01:00
ecc.h	Bluetooth: Add ECC library for LE Secure Connections	2014-12-03 16:51:16 +01:00
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	Bluetooth: Add debugfs fields for hardware and firmware info	2016-07-18 09:33:28 +03:00
hci_debugfs.h	Bluetooth: Provide option to enable/disable debugfs information	2015-02-15 18:54:13 +02:00
hci_event.c	Bluetooth: Add Authentication Failed reason to Disconnected Mgmt event	2016-07-13 08:32:12 +03:00
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	Bluetooth: Remove controller device attributes	2016-07-09 21:37:11 +03:00
Kconfig	Bluetooth: add LED trigger for indicating HCI is powered up	2016-02-23 20:29:35 +01:00
l2cap_core.c	Bluetooth: Fix using the correct source address type	2016-11-22 22:50:46 +01:00
l2cap_sock.c	Bluetooth: split sk_filter in l2cap_sock_recv_cb	2016-08-24 16:55:04 +02:00
leds.c	Bluetooth: Add combined LED trigger for controller power	2016-09-19 20:19:34 +02:00
leds.h	Bluetooth: Add combined LED trigger for controller power	2016-09-19 20:19:34 +02:00
lib.c	Bluetooth: Add BT_WARN and bt_dev_warn logging macros	2015-09-24 16:25:44 +02:00
Makefile	Bluetooth: add LED trigger for indicating HCI is powered up	2016-02-23 20:29:35 +01:00
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	Bluetooth: Add generic mgmt helper API	2015-03-17 18:03:08 +01:00
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	Bluetooth: Export ECDH selftest result in debugfs	2015-04-02 08:47:38 +03:00
selftest.h	Bluetooth: Add support for self testing framework	2014-12-30 08:53:55 +02:00
smp.c	Bluetooth: Fix not registering BR/EDR SMP channel with force_bredr flag	2016-09-19 20:19:34 +02:00
smp.h	Bluetooth: Fix crash in SMP when unpairing	2015-10-22 09:02:03 +02:00