David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
bnep	net: remove MTU limits on a few ether_setup callers	2016-10-21 13:57:50 -04:00
cmtp	sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>	2017-03-02 08:42:32 +01:00
hidp	Bluetooth: hidp: fix device disconnect on idle timeout	2015-10-21 00:49:23 +02:00
rfcomm	Bluetooth: convert rfcomm_dlc.refcnt from atomic_t to refcount_t	2017-04-12 22:02:36 +02:00
6lowpan.c	net: Fix inconsistent teardown and release of private netdev state.	2017-06-07 15:53:24 -04:00
a2mp.c	locking/atomic, kref: Add kref_read()	2017-01-14 11:37:18 +01:00
a2mp.h	Bluetooth: Add BT_HS config option	2015-07-30 13:31:59 +02:00
af_bluetooth.c	net: socket: mark socket protocol handler structs as const	2017-05-16 11:54:07 -04:00
amp.c	Bluetooth: fix assignments on error variable err	2017-04-12 22:02:38 +02:00
amp.h	Bluetooth: Add BT_HS config option	2015-07-30 13:31:59 +02:00
ecdh_helper.c	Bluetooth: Delete error messages for failed memory allocations in two functions	2017-05-22 10:23:41 +02:00
ecdh_helper.h	Bluetooth: convert smp and selftest to crypto kpp API	2017-04-25 04:53:42 +02:00
hci_conn.c	Bluetooth: Fix using the correct source address type	2016-11-22 22:50:46 +01:00
hci_core.c	Bluetooth: Send HCI Set Event Mask Page 2 command only when needed	2017-06-12 11:45:30 +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: fix spelling mistake: "advetising" -> "advertising"	2017-02-16 17:39:35 +01:00
hci_request.c	sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>	2017-03-02 08:42:32 +01: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: Fix user channel for 32bit userspace on 64bit kernel	2017-04-30 12:22:14 +02:00
hci_sysfs.c	Bluetooth: Remove controller device attributes	2016-07-09 21:37:11 +03:00
Kconfig	Bluetooth: convert smp and selftest to crypto kpp API	2017-04-25 04:53:42 +02:00
l2cap_core.c	Bluetooth: L2CAP: Add l2cap_le_flowctl_send	2017-04-12 22:02:41 +02:00
l2cap_sock.c	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08: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: convert smp and selftest to crypto kpp API	2017-04-25 04:53:42 +02: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	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
selftest.c	Bluetooth: allocate data for kpp on heap	2017-04-30 12:22:05 +02:00
selftest.h	Bluetooth: Add support for self testing framework	2014-12-30 08:53:55 +02:00
smp.c	Bluetooth: use constant time memory comparison for secret values	2017-06-10 15:45:40 +02:00
smp.h	Bluetooth: SMP: Add support for H7 crypto function and CT2 auth flag	2016-12-08 07:50:24 +01:00