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