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-21 13:57:50 -04:00
2015-12-20 08:11:10 +01:00
2015-10-21 00:49:23 +02:00
2016-11-22 22:50:46 +01:00
2016-11-22 22:50:46 +01:00
2015-07-30 13:37:22 +02:00
2015-07-30 13:31:59 +02:00
2016-09-19 20:19:34 +02:00
2015-08-10 20:41:34 +02:00
2015-07-30 13:31:59 +02:00
2014-12-03 16:51:16 +01:00
2014-12-03 16:51:16 +01:00
2016-11-22 22:50:46 +01:00
2016-09-19 20:19:34 +02:00
2016-07-18 09:33:28 +03:00
2015-02-15 18:54:13 +02:00
2016-07-13 08:32:12 +03:00
2016-10-19 18:42:37 +02:00
2016-10-19 18:42:37 +02:00
2016-09-19 20:19:34 +02:00
2016-07-09 21:37:11 +03:00
2016-02-23 20:29:35 +01:00
2016-11-22 22:50:46 +01:00
2016-08-24 16:55:04 +02:00
2016-09-19 20:19:34 +02:00
2016-09-19 20:19:34 +02:00
2015-09-24 16:25:44 +02:00
2016-02-23 20:29:35 +01:00
2016-09-19 20:19:34 +02:00
2015-03-17 18:03:08 +01:00
2016-10-19 18:42:37 +02:00
2016-11-22 22:50:46 +01:00
2015-04-02 08:47:38 +03:00
2014-12-30 08:53:55 +02:00
2016-09-19 20:19:34 +02:00
2015-10-22 09:02:03 +02:00
0b42f25d2f