David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-26 23:42:21 -05:00
..
adf7242.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-26 23:42:21 -05:00
at86rf230.c	at86rf230: increase sleep to off timings	2016-04-20 16:17:13 +02:00
at86rf230.h	at86rf230: add debugfs support	2015-09-17 13:20:05 +02:00
atusb.c	net: ieee802154: constify ieee802154_ops structures	2016-11-21 15:46:12 -05:00
atusb.h	ieee802154: add support for atusb transceiver	2015-05-19 11:44:45 +02:00
cc2520.c	ieee802154: cc2520: Check CRC & add promiscuous	2016-01-03 09:17:42 +01:00
fakelb.c	fakelb: fix schedule while atomic	2016-09-19 20:19:34 +02:00
Kconfig	ieee802154/adf7242: Driver for ADF7242 MAC IEEE802154	2015-12-11 11:27:22 +01:00
Makefile	ieee802154/adf7242: Driver for ADF7242 MAC IEEE802154	2015-12-11 11:27:22 +01:00
mrf24j40.c	mrf24j40: avoid uninitialized byte in SPI transfer to radio.	2016-07-12 11:54:53 +02:00