Files
linux/include/linux
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-25 11:49:31 +03:00
2015-09-16 20:44:47 +01:00
2015-05-13 12:04:55 -05:00
2015-08-03 12:01:54 -04:00
2015-08-06 16:17:25 -04:00
2015-09-04 16:54:41 -07:00
2015-09-08 15:35:28 -07:00
2015-08-20 10:20:11 +03:00
2015-06-24 17:49:45 -07:00
2015-07-17 08:41:53 -06:00
2015-05-12 10:46:53 +02:00
2015-06-01 14:33:35 +02:00
2015-06-19 15:18:28 +02:00
2015-09-08 15:35:28 -07:00
2015-09-08 15:35:28 -07:00
2015-08-27 19:40:58 -04:00
2015-06-25 12:06:45 +02:00
2015-08-18 15:49:15 -07:00
2015-07-28 08:50:42 +01:00
2015-09-06 16:27:10 +02:00
2015-10-01 21:42:35 -04:00
2015-06-24 17:49:41 -07:00
2015-10-01 21:42:35 -04:00
2015-07-21 10:39:05 -07:00
2015-06-25 04:20:04 -04:00
2015-10-08 05:26:35 -07:00
2015-08-17 13:32:56 -05:00
2015-08-18 11:56:13 -06:00
2015-09-10 13:29:01 -07:00
2015-09-10 13:29:01 -07:00
2015-09-10 13:29:01 -07:00
2015-09-08 15:35:28 -07:00
2015-10-03 05:05:18 -07:00
2015-06-19 01:18:14 +02:00
2015-08-17 15:40:20 +02:00
2015-05-27 12:58:04 -07:00
2015-05-26 15:23:23 +02:00
2015-06-25 01:13:43 +02:00
2015-09-10 15:36:59 -04:00
2015-06-25 17:00:39 -07:00
2015-10-12 19:28:24 -07:00
2015-08-17 11:25:28 -07:00
2015-07-22 15:27:29 -07:00
2015-08-28 16:27:27 -07:00
2015-06-12 17:26:57 -07:00
2015-09-08 15:35:28 -07:00
2015-09-10 13:29:01 -07:00