David S. Miller 4963ed48f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv4/arp.c The net/ipv4/arp.c conflict was one commit adding a new local variable while another commit was deleting one. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-09-26 16:08:27 -07:00
..
bnep
cmtp	Bluetooth: cmtp: Do not use list_for_each_safe when not needed	2015-07-30 13:50:35 +02:00
hidp
rfcomm
6lowpan.c	6lowpan: add generic 6lowpan netdev private data	2015-08-11 22:05:36 +02: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
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
ecc.h
hci_conn.c	Bluetooth: timeout handling in new connect procedure	2015-08-10 21:36:13 +02:00
hci_core.c	Bluetooth: close HCI device when user channel socket gets closed	2015-09-17 13:20:02 +02:00
hci_debugfs.c
hci_debugfs.h
hci_event.c	Bluetooth: Fix reporting incorrect EIR in device found mgmt event	2015-09-18 09:53:20 +02: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: close HCI device when user channel socket gets closed	2015-09-17 13:20:02 +02:00
hci_sysfs.c
Kconfig	Bluetooth: Add BT_HS config option	2015-07-30 13:31:59 +02:00
l2cap_core.c	Bluetooth: Enable new connection establishment procedure.	2015-08-10 21:36:13 +02:00
l2cap_sock.c	Bluetooth: __l2cap_wait_ack() add defensive timeout	2015-07-23 17:10:51 +02:00
lib.c	Bluetooth: Add BT_ERR_RATELIMITED	2015-09-18 09:53:19 +02:00
Makefile	Bluetooth: Add BT_HS config option	2015-07-30 13:31:59 +02:00
mgmt_util.c
mgmt_util.h
mgmt.c	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next	2015-08-17 15:41:21 -07:00
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