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-04-14 01:16:13 +02:00
2015-01-15 15:32:30 +01:00
2015-06-26 11:54:29 -07:00
2015-04-22 09:09:46 -07:00
2015-09-01 13:09:20 -07:00
2015-09-01 13:09:20 -07:00
2015-01-21 14:35:06 -08:00
2014-09-16 10:25:51 +08:00
2015-09-01 13:09:20 -07:00
2015-09-01 13:09:20 -07:00
2015-09-01 13:09:20 -07:00
2015-09-01 13:09:20 -07:00
2015-09-01 13:09:20 -07:00
2015-09-01 13:09:20 -07:00
2015-09-01 13:09:20 -07:00
2015-07-25 11:35:08 +08:00
2015-09-01 13:09:20 -07:00
2014-09-13 21:03:48 +00:00
2014-11-18 16:36:14 +01:00
2015-03-02 11:00:59 +01:00
2015-03-30 13:18:23 +02:00
2015-04-22 09:09:46 -07:00
2015-04-22 09:09:46 -07:00
2015-04-22 09:09:46 -07:00
2015-02-17 09:36:52 -08:00
2014-11-16 15:12:04 -08:00
2014-11-16 15:12:04 -08:00
2014-11-16 15:12:04 -08:00
2014-11-16 15:12:04 -08:00
2014-11-16 15:12:04 -08:00
2015-09-01 13:09:20 -07:00
2015-09-01 13:09:20 -07:00
2015-08-12 00:59:04 -07:00
2015-08-12 00:59:04 -07:00
2015-09-01 13:09:20 -07:00
2015-09-01 13:09:20 -07:00
2015-09-01 13:09:20 -07:00