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
..
2016-10-19 08:39:47 -07:00
2016-11-11 16:51:50 -08:00
2016-10-19 08:39:47 -07:00
2016-10-27 18:43:42 -07:00
2016-10-19 08:39:47 -07:00
2016-10-19 08:39:47 -07:00
2016-11-26 12:18:59 -08:00