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-09-27 14:37:17 +08:00
2016-09-27 14:02:16 +08:00
2016-09-27 14:35:21 +08:00
2016-09-27 14:35:21 +08:00
2016-09-27 14:02:32 +08:00
2016-09-27 14:35:21 +08:00
2015-10-30 11:33:23 -07:00
2016-08-08 10:57:39 +08:00
2016-09-27 09:38:17 +08:00
2015-09-13 20:26:19 -07:00
2016-09-27 14:35:21 +08:00
2016-09-27 14:02:16 +08:00
2015-08-03 23:15:50 +08:00
2016-08-08 10:57:39 +08:00
2016-09-27 14:02:16 +08:00
2016-09-27 14:35:21 +08:00
2016-09-27 14:35:21 +08:00
2016-09-27 14:35:21 +08:00
2016-10-20 14:15:44 +08:00
2016-11-21 20:54:40 +08:00
2015-12-09 01:18:34 +01:00
2016-09-27 14:35:21 +08:00
2015-05-01 11:20:42 +08:00
2016-06-08 13:03:26 +02:00
2016-09-27 14:03:19 +08:00
2015-08-03 23:15:50 +08:00
2016-09-27 14:03:19 +08:00
2016-09-27 14:35:21 +08:00
2016-09-27 14:02:16 +08:00
2016-09-27 14:35:21 +08:00
2016-08-08 10:57:39 +08:00
2016-09-27 14:35:21 +08:00
2016-09-27 14:02:16 +08:00
2016-10-12 11:05:23 -07:00
2016-09-27 14:35:21 +08:00
2016-02-09 14:12:08 -08:00
2016-08-08 10:57:39 +08:00
2016-09-27 14:02:16 +08:00
2016-10-27 16:16:09 -04:00
2015-12-29 15:59:44 +08:00
2016-08-08 10:57:39 +08:00
2013-09-03 09:09:12 -04:00
2016-05-17 07:28:31 -07:00
2016-09-27 14:37:10 +08:00
2016-09-27 14:35:21 +08:00