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