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-08-20 14:08:08 -07:00
2015-08-06 21:54:13 -07:00
2015-07-22 10:47:26 -07:00
2015-09-17 22:32:16 -07:00
2015-07-29 23:24:45 -07:00
2015-07-29 23:24:45 -07:00
2015-07-29 23:24:45 -07:00
2015-09-17 22:32:16 -07:00
2013-01-07 19:49:14 -08:00