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-09-22 08:13:42 +01:00
2015-09-11 19:18:28 +01:00
2015-09-08 14:35:59 -07:00
2015-09-27 06:45:18 -04:00
2015-09-01 13:09:20 -07:00
2015-09-27 06:45:18 -04:00
2015-09-08 14:35:59 -07:00
2015-09-01 12:10:20 -07:00
2015-09-11 19:18:28 +01:00
2015-08-18 13:10:05 -07:00