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-11-22 16:11:44 -05:00
2016-10-13 21:28:20 -07:00
2016-10-13 21:28:20 -07:00
2016-10-13 21:28:20 -07:00
2012-07-30 19:06:41 -04:00
2015-02-03 11:06:34 -08:00
2016-03-31 00:30:15 -04:00
2016-11-18 13:35:58 -05:00
2015-04-23 15:16:14 -04:00
2015-04-23 15:16:14 -04:00
2016-05-17 15:47:55 -04:00
2012-07-30 19:06:52 -04:00
2016-07-30 16:33:25 -07:00
2016-10-07 18:46:28 -07:00
2016-09-27 11:03:58 +02:00
2016-10-07 18:46:28 -07:00
2016-07-20 23:30:06 -04:00
2016-10-07 18:46:28 -07:00