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-15 12:09:13 -07:00
2016-11-11 08:12:37 -08:00
2016-10-31 14:42:14 +01:00
2016-10-30 13:09:42 -04:00
2016-09-27 21:20:53 -04:00
2016-09-27 18:47:38 -04:00
2016-10-13 20:28:22 -07:00
2016-11-26 20:05:42 -05:00