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-07-08 02:27:32 +02:00
2016-04-27 23:42:57 +02:00
2016-11-11 23:23:02 +01:00
2015-07-08 02:27:32 +02:00
2016-01-04 22:10:30 +01:00
2015-07-08 02:27:32 +02:00
2015-07-08 02:27:32 +02:00
2016-10-10 02:20:43 +02:00
2015-11-07 01:30:10 +01:00
2015-07-08 02:27:32 +02:00
2016-10-03 20:11:49 -07:00
2016-10-03 20:11:49 -07:00
2015-09-01 03:38:43 +02:00
2015-09-01 15:52:35 +02:00
2016-11-11 23:23:02 +01:00
2016-07-19 12:32:39 -07:00