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-07 14:36:05 +02:00
2015-09-11 18:15:18 -07:00
2015-09-08 14:35:59 -07:00
2015-09-06 11:39:53 -07:00
2015-08-06 21:54:13 -07:00
2015-10-14 18:40:32 -07:00
2015-08-26 18:08:47 -07:00
2015-08-28 13:14:57 -07:00
2015-09-11 18:15:18 -07:00
2015-08-18 08:11:23 -07:00
2015-09-02 12:22:54 -07:00
2015-09-06 11:51:39 -07:00
2015-08-26 07:36:51 -07:00
2015-09-06 11:57:25 -07:00
2015-08-27 11:08:31 -07:00
2015-09-08 14:35:59 -07:00
2015-09-06 11:53:31 -07:00
2015-09-11 19:00:42 -07:00
2015-10-07 10:24:48 -07:00
2015-08-07 14:28:45 +02:00
2015-08-07 15:03:42 +02:00
2015-07-31 13:31:10 +02:00
2015-08-26 16:28:48 -07:00
2015-08-26 16:29:49 -07:00
2015-08-26 16:28:15 -07:00
2015-08-12 13:14:57 -07:00
2015-08-12 13:14:57 -07:00
2015-08-28 13:14:53 -07:00
2015-07-30 12:41:47 -07:00
2015-07-30 21:02:01 -07:00
2015-09-17 07:25:02 -07:00
2015-08-28 13:14:56 -07:00
2015-08-26 07:23:04 -07:00
2015-09-06 11:03:14 -07:00
2015-10-01 10:46:28 -07:00
2015-09-11 19:00:42 -07:00
2015-10-01 10:10:55 +02:00
2015-08-18 08:14:14 -07:00
2015-08-28 13:14:56 -07:00
2015-08-28 13:14:56 -07:00
2015-09-02 12:22:54 -07:00
2015-09-06 11:13:41 -07:00
2015-08-07 14:28:45 +02:00
2015-09-02 13:10:25 -07:00
2015-08-26 07:45:25 -07:00
2015-08-26 22:41:36 -07:00
2015-08-10 23:07:05 -04:00
2015-08-07 14:28:45 +02:00
2015-09-08 18:03:49 +01:00
26440c835f