David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Four minor merge conflicts: 1) qca_spi.c renamed the local variable used for the SPI device from spi_device to spi, meanwhile the spi_set_drvdata() call got moved further up in the probe function. 2) Two changes were both adding new members to codel params structure, and thus we had overlapping changes to the initializer function. 3) 'net' was making a fix to sk_release_kernel() which is completely removed in 'net-next'. 4) In net_namespace.c, the rtnl_net_fill() call for GET operations had the command value fixed, meanwhile 'net-next' adjusted the argument signature a bit. This also matches example merge resolutions posted by Stephen Rothwell over the past two days. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-13 14:31:43 -04:00
..
bnep	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
cmtp	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
hidp	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
rfcomm	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
6lowpan.c	Bluetooth: 6lowpan: Remove PSM setting code	2015-01-14 22:48:13 +01:00
a2mp.c	Bluetooth: Make __next_ident function static.	2015-02-15 10:14:54 +02:00
a2mp.h	Bluetooth: Make __next_ident function static.	2015-02-15 10:14:54 +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 sparse warning in amp.c	2014-11-11 00:07:29 +01:00
amp.h	Bluetooth: Move amp.h header file into net/bluetooth/	2013-10-11 00:10:03 +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: Introduce hci_dev_clear_flag helper macro	2015-03-13 12:09:27 +02:00
hci_core.c	Bluetooth: Skip the shutdown routine if the interface is not up	2015-04-30 18:45:27 +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: Read LE remote features during connection establishment	2015-04-09 08:36:54 +03:00
hci_request.c	Bluetooth: Add second hci_request callback option for full skb	2015-04-02 16:09:27 +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	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
hci_sysfs.c	Bluetooth: Convert to use ATTRIBUTE_GROUPS macro	2014-02-13 09:51:34 +02:00
Kconfig	Bluetooth: Provide option to enable/disable debugfs information	2015-02-15 18:54:13 +02:00
l2cap_core.c	Bluetooth: Refactor L2CAP variables into l2cap_ctrl	2015-03-30 23:20:53 +02:00
l2cap_sock.c	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
lib.c	Bluetooth: Convert bt_<level> logging functions to return void	2014-09-24 09:40:08 +02:00
Makefile	Bluetooth: Add generic mgmt helper API	2015-03-17 18:03:08 +01: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: Add local SSP OOB data to OOB ext data mgmt command	2015-04-07 23:31:20 +02:00
sco.c	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04: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: Export SMP selftest result in debugfs	2015-04-02 08:47:40 +03:00
smp.h	Bluetooth: Add function for generating LE SC out-of-band data	2015-03-16 10:31:27 +02:00