David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/renesas/ravb_main.c
	kernel/bpf/syscall.c
	net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-12-03 21:09:12 -05:00

..

bnep

net: Pass kern from net_proto_family.create to sk_alloc

2015-05-11 10:50:17 -04:00

cmtp

Bluetooth: Delete an unnecessary check before the function call "kfree_skb"

2015-11-19 17:50:32 +01:00

hidp

Bluetooth: hidp: fix device disconnect on idle timeout

2015-10-21 00:49:23 +02:00

rfcomm

Bluetooth: Fix potential NULL dereference in RFCOMM bind callback

2015-06-06 08:44:33 +02:00

6lowpan.c

bluetooth: 6lowpan: fix NOHZ: local_softirq_pending

2015-10-27 09:53:36 +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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-03 21:09:12 -05: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: Remove conn_unfinished variable from hci_connect_le()

2015-11-19 17:50:32 +01:00

hci_core.c

Bluetooth: Clean up hci_core code

2015-11-19 17:50:33 +01: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: Rename bt_cb()->req into bt_cb()->hci

2015-10-26 08:21:03 +02:00

hci_request.c

Bluetooth: Fix returning proper HCI status from __hci_req_sync

2015-11-23 13:50:11 +01:00

hci_request.h

Bluetooth: Move Stop Discovery to req_workqueue

2015-11-19 17:50:31 +01:00

hci_sock.c

Bluetooth: Add support for controller specific logging

2015-11-19 17:50:28 +01:00

hci_sysfs.c

Bluetooth: Convert to use ATTRIBUTE_GROUPS macro

2014-02-13 09:51:34 +02:00

Kconfig

Bluetooth: Add BT_HS config option

2015-07-30 13:31:59 +02:00

l2cap_core.c

Bluetooth: remove unneeded variable in l2cap_stream_rx

2015-11-19 17:50:33 +01:00

l2cap_sock.c

Bluetooth: l2cap_disconnection_req priority over shutdown

2015-10-21 00:49:26 +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 BT_HS config option

2015-07-30 13:31:59 +02: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

mgmt.c

Bluetooth: Increment management interface revision

2015-11-23 14:13:32 +01:00

sco.c

Bluetooth: Fix crash on fast disconnect of SCO

2015-10-27 06:00:07 +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 l2cap_chan leak in SMP

2015-11-11 23:48:34 +01:00

smp.h

Bluetooth: Fix crash in SMP when unpairing

2015-10-22 09:02:03 +02:00