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-25 21:13:16 +08:00
2015-07-27 14:06:24 +02:00
2015-05-28 11:31:52 +09:30
2015-07-17 16:39:53 -07:00
2015-07-28 08:50:42 +01:00
2015-10-08 05:26:35 -07:00
2015-09-08 14:35:59 -07:00
2015-06-25 17:00:40 -07:00
2015-07-20 10:52:48 -07:00