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-08 11:46:48 -07:00
2015-09-01 12:18:40 -07:00
2015-09-09 10:55:32 -07:00
2015-08-28 22:59:36 -04:00
2015-09-19 11:39:02 -07:00
2015-09-08 16:26:18 -07:00
2015-09-02 12:22:54 -07:00
2015-08-22 14:57:59 -07:00
2015-09-10 13:29:01 -07:00