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 13:27:16 -05:00
2016-10-06 07:59:37 -07:00
2016-10-17 15:03:20 -07:00
2016-10-10 11:19:47 +08:00
2016-11-26 15:26:20 -08:00
2016-11-23 10:00:03 +00:00
2016-11-04 17:56:28 +00:00
2016-11-23 10:00:03 +00:00
2016-09-21 22:45:05 +02:00
2016-09-21 22:45:13 +02:00
2016-10-07 21:18:42 -07:00
2016-09-02 18:15:00 +02:00
2016-09-21 22:45:13 +02:00
2016-10-07 21:29:04 -07:00
2016-10-07 21:18:42 -07:00
2016-08-26 15:10:19 +01:00
2016-07-07 09:37:59 +01:00
2016-11-26 15:26:20 -08:00
2016-10-07 21:34:49 -07:00
2016-09-21 22:45:13 +02:00
2016-07-07 17:54:25 +02:00
2016-08-01 18:21:13 -04:00
2016-09-14 16:35:37 +02:00
2016-10-17 13:44:03 -07:00
2016-08-09 14:01:41 +08:00
2016-09-09 23:15:50 +02:00
2016-07-30 11:32:01 -07:00
2016-08-26 08:41:59 -07:00
2016-11-07 16:24:53 -07:00
2016-09-14 16:36:20 +02:00
2016-08-10 22:42:32 +02:00
2016-08-01 18:21:13 -04:00
2016-08-01 18:21:13 -04:00
2016-10-18 14:14:20 -04:00
2016-08-23 15:46:05 -05:00
2016-09-02 18:12:09 +02:00
2016-08-01 18:21:13 -04:00
2016-08-26 15:10:19 +01:00
2016-10-07 21:18:42 -07:00
2016-08-16 08:16:43 +02:00
2016-08-10 22:42:18 +02:00
2016-10-07 09:12:19 -07:00
2016-10-07 21:18:42 -07:00
2016-09-21 22:45:05 +02:00
2016-07-14 15:08:15 +02:00
2016-09-08 14:32:23 +02:00
2016-07-07 16:09:30 +02:00
2016-08-01 18:21:13 -04:00
2016-08-01 18:21:13 -04:00
2016-10-22 18:25:35 +09:00
2016-08-01 18:36:01 -04:00
2016-09-21 22:45:05 +02:00
2016-08-01 18:21:13 -04:00
2016-08-01 18:21:13 -04:00
2016-11-15 15:29:37 +00:00
2016-07-07 18:06:40 +02:00
2016-09-14 16:36:13 +02:00
2016-08-09 08:16:58 +02:00
2016-08-24 06:42:27 +02:00
2016-07-15 10:40:22 +02:00
2016-09-14 14:39:13 +01:00
2016-10-07 21:38:00 -07:00
2016-09-15 00:27:27 +02:00
2016-10-06 08:56:43 +01:00
0b42f25d2f