David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
bnep
cmtp
hidp
rfcomm
6lowpan.c	6lowpan: move shared settings to lowpan_netdev_setup	2015-10-08 14:25:34 +02:00
a2mp.c
a2mp.h
af_bluetooth.c
amp.c	Bluetooth: Fix breakage in amp_write_rem_assoc_frag()	2015-08-10 20:41:34 +02:00
amp.h
ecc.c
ecc.h
hci_conn.c	Bluetooth: Fix initializing conn_params in scan phase	2015-10-16 09:24:41 +02:00
hci_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
hci_debugfs.c
hci_debugfs.h
hci_event.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
hci_request.c	Bluetooth: add hci_lookup_le_connect	2015-08-10 21:36:13 +02:00
hci_request.h
hci_sock.c	Bluetooth: Add support for vendor specific diagnostic channel	2015-10-08 09:51:13 +03:00
hci_sysfs.c
Kconfig
l2cap_core.c	Bluetooth: Enable new connection establishment procedure.	2015-08-10 21:36:13 +02:00
l2cap_sock.c
lib.c	Bluetooth: Add BT_WARN and bt_dev_warn logging macros	2015-09-24 16:25:44 +02:00
Makefile
mgmt.c	Bluetooth: Fix initializing conn_params in scan phase	2015-10-16 09:24:41 +02:00
mgmt_util.c
mgmt_util.h
sco.c	Bluetooth: Make the function sco_conn_del have a return type of void	2015-08-28 21:00:37 +02:00
selftest.c
selftest.h
smp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 16:08:27 -07:00
smp.h