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
..
2014-10-09 11:35:48 +03:00
2011-03-11 14:25:50 +00:00
2016-10-11 15:06:30 -07:00
2015-11-23 09:44:58 +01:00
2016-03-17 15:09:34 -07:00
2011-10-29 21:20:22 +02:00
2016-02-29 09:35:20 +01:00
2016-02-07 23:17:59 -08:00
2016-10-06 17:13:54 -07:00
2014-04-30 19:49:37 +01:00
2014-08-06 18:01:25 -07:00
2014-05-05 09:09:14 +02:00
2016-05-23 17:04:14 -07:00
2014-08-08 15:57:25 -07:00
2016-03-09 15:43:42 -08:00
2015-02-12 18:54:15 -08:00
2012-07-30 17:25:16 -07:00
2014-06-25 17:45:43 -07:00
2015-09-08 14:35:59 -07:00
2015-02-12 18:54:16 -08:00
2016-07-06 10:51:14 +01:00
2016-09-20 04:43:36 -04:00
2016-09-19 08:19:40 -06:00
2015-03-23 22:12:08 -04:00
2015-06-25 17:00:40 -07:00
2016-03-17 15:09:34 -07:00
2016-05-30 15:26:57 -07:00
2016-08-02 17:31:41 -04:00