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
..
2015-08-25 13:38:50 -07:00
2016-04-27 22:48:24 -04:00
2016-10-20 14:32:22 -04:00
2016-04-27 22:48:23 -04:00
2016-06-10 23:07:49 -07:00
2016-09-21 00:23:00 -04:00
2016-10-20 14:32:22 -04:00
2015-09-17 17:18:37 -07:00
2013-05-31 17:19:05 -07:00