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-06-16 16:45:38 +10:00
2015-06-16 16:45:38 +10:00
2015-09-16 15:47:51 +02:00
2014-05-28 10:11:55 +02:00
2015-01-15 13:44:51 +01:00
2013-11-26 11:09:21 +01:00
2015-09-16 15:47:51 +02:00
2015-09-28 10:01:09 +02:00
2015-07-29 08:55:15 -06:00
2011-03-31 11:26:23 -03:00
2014-05-28 10:11:55 +02:00
2011-03-31 11:26:23 -03:00
2015-09-28 09:59:45 +02:00
2015-09-28 09:59:44 +02:00
2015-03-15 10:23:30 +01:00
2015-09-29 21:11:13 -07:00
2013-06-24 19:44:19 +02:00
2015-05-19 08:39:15 +02:00
2015-01-11 11:38:41 +01:00
2015-01-11 11:38:45 +01:00
2013-11-26 11:08:54 +01:00
2014-11-20 09:11:15 +01:00
2013-11-26 11:09:22 +01:00
2007-10-19 23:21:04 +02:00
2009-09-20 12:18:14 +02:00
2015-09-10 13:29:01 -07:00
2013-04-16 21:08:11 +02:00
2015-07-13 09:34:39 +10:00
2014-05-28 10:10:04 +02:00
2014-10-08 05:40:17 -04:00
2013-08-26 16:51:14 +10:00
2014-09-29 09:18:35 +10:00
26440c835f