David S. Miller 26440c835f
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/usb/asix_common.c
net/ipv4/inet_connection_sock.c
net/switchdev/switchdev.c
In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.
The other two conflicts were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
2015-10-16 00:24:10 -07:00
2015-10-18 19:36:04 -07:00
2015-10-05 06:58:38 -07:00
2013-12-06 12:37:55 -05:00
2014-10-20 00:53:30 -04:00
2015-03-03 17:01:36 -05:00
2014-01-16 11:53:26 -08:00
2015-09-15 12:43:27 -07:00
2015-09-24 12:26:08 -07:00
2015-09-15 12:43:19 -07:00
2014-08-02 15:44:18 -07:00
2015-09-15 12:43:49 -07:00
2015-09-22 17:34:57 -07:00
2015-03-24 14:56:02 -04:00
2015-10-16 00:24:10 -07:00
2014-02-17 14:35:46 -05:00
2015-03-03 21:16:48 -05:00
2015-07-09 14:58:31 -07:00
2013-12-06 12:37:55 -05:00
2014-06-03 23:32:12 -07:00
2014-01-16 11:53:26 -08:00
2015-01-12 16:42:49 -05:00
2015-10-20 06:08:27 -07:00
2015-09-28 22:28:53 -07:00
2015-09-17 22:15:37 -07:00
2015-03-03 17:01:36 -05:00
2015-09-21 16:16:16 -07:00
2015-10-16 00:24:10 -07:00
2014-02-17 14:35:46 -05:00
2014-05-13 17:43:20 -04:00
2013-04-29 13:57:50 -04:00
2015-02-20 15:12:48 -05:00
2015-09-15 12:43:38 -07:00
2015-09-09 20:27:54 -07:00
2014-02-17 14:35:46 -05:00
2014-11-19 15:17:11 -05:00
2013-12-06 12:37:55 -05:00
2015-09-22 16:14:32 -07:00
2013-12-06 12:37:55 -05:00
2015-09-22 16:14:32 -07:00
2013-12-06 12:37:55 -05:00
2015-02-04 13:53:02 -08:00
2015-02-04 13:53:02 -08:00
2015-10-16 00:24:10 -07:00
2014-02-10 16:53:06 -08:00
2015-09-15 12:43:11 -07:00
2014-01-16 11:53:26 -08:00
26440c835f