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