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