Files
linux/include/net
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-06-14 12:55:49 -07:00
2014-09-18 10:54:36 +02:00
2015-03-04 00:23:23 -05:00
2015-06-28 16:55:44 -07:00
2015-03-06 21:50:02 -05:00
2015-09-17 17:18:37 -07:00
2015-08-31 21:23:42 -07:00
2015-10-08 04:27:03 -07:00
2013-11-07 19:28:58 -05:00
2014-09-30 01:02:26 -04:00
2015-09-24 12:25:23 -07:00
2015-09-24 09:34:43 +09:00
2015-10-08 04:27:03 -07:00
2015-10-13 04:55:04 -07:00
2014-01-03 20:56:48 -05:00
2015-10-08 04:27:03 -07:00
2015-07-21 10:39:05 -07:00
2015-09-17 21:09:07 -07:00
2014-06-02 11:00:41 -07:00
2015-03-12 22:58:12 -04:00
2015-10-18 22:26:02 -07:00
2014-05-22 14:57:15 -04:00
2015-10-08 04:27:03 -07:00