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	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
cmtp	Bluetooth: cmtp: Do not use list_for_each_safe when not needed	2015-07-30 13:50:35 +02:00
hidp	bluetooth: fix list handling	2015-07-04 19:11:33 -07:00
rfcomm	Bluetooth: Fix potential NULL dereference in RFCOMM bind callback	2015-06-06 08:44:33 +02:00
6lowpan.c	6lowpan: add generic 6lowpan netdev private data	2015-08-11 22:05:36 +02:00
Kconfig	Bluetooth: Add BT_HS config option	2015-07-30 13:31:59 +02:00
Makefile	Bluetooth: Add BT_HS config option	2015-07-30 13:31:59 +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	Bluetooth: Convert mgmt to use HCI chan registration API	2015-03-06 20:15:21 +01: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: 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	Bluetooth: Expose current Device ID information via debugfs	2015-04-02 08:40:35 +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 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	Bluetooth: Add second hci_request callback option for full skb	2015-04-02 16:09:27 +02:00
hci_sock.c	Bluetooth: close HCI device when user channel socket gets closed	2015-09-17 13:20:02 +02:00
hci_sysfs.c	Bluetooth: Convert to use ATTRIBUTE_GROUPS macro	2014-02-13 09:51:34 +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
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
mgmt_util.c	Bluetooth: Add generic mgmt helper API	2015-03-17 18:03:08 +01:00
mgmt_util.h	Bluetooth: Add generic mgmt helper API	2015-03-17 18:03:08 +01: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	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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 16:08:27 -07:00
smp.h	Bluetooth: Add function for generating LE SC out-of-band data	2015-03-16 10:31:27 +02:00