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-05-26 13:48:16 +03:00
2015-08-13 15:31:24 +03:00
2015-08-13 15:32:49 +03:00
2015-03-03 15:30:03 +02:00
2015-08-25 15:25:19 +03:00
2015-08-13 15:31:23 +03:00
2015-08-25 15:11:08 +03:00
2015-06-15 12:30:20 +03:00
2015-08-13 15:31:21 +03:00
2015-08-20 14:13:25 -07:00
2015-08-13 15:31:21 +03:00
2015-10-03 09:41:32 +03:00
2015-06-10 16:05:36 +02:00
2015-04-07 20:09:04 +03:00
2014-09-26 17:22:28 -04:00
2015-03-03 15:30:05 +02:00
2015-09-22 15:21:23 +02:00
2015-04-24 11:14:13 +02:00
2014-09-26 17:22:28 -04:00
2014-09-26 17:22:28 -04:00
2014-09-30 13:17:38 -04:00
2015-03-03 15:30:08 +02:00
2015-05-26 14:04:56 +03:00
2014-09-30 13:17:14 -04:00
2015-04-07 20:09:04 +03:00
2015-10-03 09:41:32 +03:00
2014-09-26 17:22:28 -04:00
2014-09-26 17:22:28 -04:00
2014-09-26 17:22:28 -04:00
2015-04-07 20:09:04 +03:00
2014-09-26 17:22:28 -04:00
2015-05-26 13:56:31 +03:00
2015-05-26 13:56:31 +03:00
2015-03-16 17:55:41 +02:00
2015-03-16 17:55:41 +02:00
2015-04-28 13:55:28 +03:00
2013-03-25 16:42:22 -04:00
2015-10-03 09:41:32 +03:00
26440c835f