David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
6lowpan	net: Fix inconsistent teardown and release of private netdev state.	2017-06-07 15:53:24 -04:00
core.c	ieee802154: add netns support	2016-07-08 12:20:57 +02:00
core.h	ieee802154: add netns support	2016-07-08 12:20:57 +02:00
header_ops.c	ieee802154: change needed headroom/tailroom	2015-09-22 11:51:20 +02:00
ieee802154.h	ieee802154: add nl802154 framework	2014-11-09 19:50:29 +01:00
Kconfig	nl802154: add support for security layer	2015-09-30 13:16:44 +02:00
Makefile	Makefile: drop -D__CHECK_ENDIAN__ from cflags	2016-12-16 00:13:43 +02:00
netlink.c	genetlink: mark families as __ro_after_init	2016-10-27 16:16:09 -04:00
nl802154.c	netlink: pass extended ACK struct where available	2017-04-13 13:58:22 -04:00
nl802154.h	ieee802154: add nl802154 framework	2014-11-09 19:50:29 +01:00
nl_policy.c	ieee802154: mac802154: remove FSF address	2014-10-25 08:07:30 +02:00
nl-mac.c	ieee802154: use nla_put_u64_64bit()	2016-04-25 15:09:11 -04:00
nl-phy.c	ieee802154: check device type	2016-11-30 12:33:07 +01:00
rdev-ops.h	nl802154: add support for security layer	2015-09-30 13:16:44 +02:00
socket.c	net: ieee802154: fix net_device reference release too early	2017-05-23 20:05:15 +02:00
sysfs.c	cfg802154: add PM hooks	2015-07-23 17:10:49 +02:00
sysfs.h	ieee802154: introduce sysfs file	2014-10-28 23:19:09 +01:00
trace.c	ieee802154: Add trace events for rdev->ops	2015-04-30 18:48:09 +02:00
trace.h	ieee802154: add ack request default handling	2015-08-10 20:43:06 +02:00