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-20 08:28:11 +02:00
2015-03-20 08:28:11 +02:00
2015-01-15 14:25:03 +02:00
2015-03-20 08:27:17 +02:00
2015-03-03 14:55:24 +02:00
2015-01-15 14:25:03 +02:00
2015-03-13 15:19:36 +02:00
2015-09-29 10:39:22 +03:00
2015-03-30 11:31:32 +03:00
2015-08-06 10:11:06 +03:00
2015-09-29 10:39:22 +03:00
2015-04-07 20:15:01 +03:00
2015-09-29 10:39:22 +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-01-15 14:25:03 +02:00
2015-10-12 19:39:18 -07: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-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