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