David S. Miller
36583eb54d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Conflicts:
drivers/net/ethernet/cadence/macb.c
drivers/net/phy/phy.c
include/linux/skbuff.h
net/ipv4/tcp.c
net/switchdev/switchdev.c
Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.
phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.
tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.
macb.c involved the addition of two zyncq device entries.
skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-23 01:22:35 -04:00
..
2015-04-15 16:35:20 -07:00
2015-02-17 16:12:34 -08:00
2014-10-29 16:33:15 -07:00
2014-11-13 16:17:06 -08:00
2015-04-14 16:49:03 -07:00
2015-04-15 16:35:20 -07:00
2015-04-15 16:35:19 -07:00
2015-04-14 16:49:00 -07:00
2015-04-15 16:35:20 -07:00
2014-12-13 12:42:48 -08:00
2015-02-11 17:06:04 -08:00
2014-10-09 22:26:00 -04:00
2014-04-07 16:36:15 -07:00
2015-02-16 17:56:03 -08:00
2015-04-16 23:27:56 -04:00
2014-12-10 17:41:08 -08:00
2015-04-15 16:35:18 -07:00
2014-08-06 18:01:22 -07:00
2015-04-15 16:35:19 -07:00
2015-02-11 17:06:02 -08:00
2015-04-15 16:35:19 -07:00
2015-05-05 17:10:11 -07:00
2015-04-15 16:35:18 -07:00
2015-02-10 14:30:31 -08:00
2015-04-14 16:49:00 -07:00
2015-01-08 15:10:52 -08:00
2014-10-09 22:25:50 -04:00
2014-06-06 16:08:18 -07:00
2015-05-14 17:55:51 -07:00
2015-04-15 16:35:18 -07:00
2015-02-12 18:54:10 -08:00
2015-02-16 17:56:03 -08:00
2015-04-14 16:49:06 -07:00
2015-04-15 16:35:19 -07:00
2015-04-15 16:35:18 -07:00
2015-04-15 16:35:19 -07:00
2015-05-05 17:10:10 -07:00
2015-04-15 16:35:20 -07:00
2015-05-14 17:55:51 -07:00
2015-04-15 16:35:20 -07:00
2015-04-14 16:49:06 -07:00
2015-04-15 16:35:17 -07:00
2015-02-11 17:06:06 -08:00
2015-04-14 16:49:00 -07:00
2015-02-12 18:54:11 -08:00
2015-04-15 16:35:19 -07:00
2014-02-21 08:50:17 +01:00
2014-11-13 13:46:09 +11:00
2015-02-11 17:06:02 -08:00
2015-03-25 16:20:31 -07:00
2015-04-15 16:35:18 -07:00
2015-02-10 14:30:31 -08:00
2014-11-13 16:17:06 -08:00
2015-04-11 22:27:56 -04:00
2015-04-15 16:35:16 -07:00
2015-05-12 10:39:26 -04:00
2015-02-11 17:06:02 -08:00
2014-12-13 12:42:48 -08:00
2015-04-11 22:29:45 -04:00
2015-05-14 17:55:51 -07:00
2015-02-11 17:06:07 -08:00
2015-04-23 10:36:33 -06:00
2015-03-25 16:20:30 -07:00
2014-09-02 14:46:05 -04:00
2014-09-02 14:46:02 -04:00
2015-03-24 13:41:54 -04:00
2015-02-12 18:54:08 -08:00
2015-04-11 22:27:12 -04:00
2015-01-20 14:03:04 -07:00
2015-04-15 16:35:18 -07:00
2015-04-15 15:06:58 -04:00
2015-02-13 21:21:41 -08:00
2015-04-14 16:49:03 -07:00
2015-02-12 18:54:10 -08:00
2015-04-14 16:48:59 -07:00
2015-04-15 16:35:18 -07:00
2014-01-21 16:19:47 -08:00
2014-04-07 16:35:54 -07:00
2014-12-10 17:41:09 -08:00
2015-04-15 16:35:18 -07:00
2015-04-15 16:35:19 -07:00
2015-04-15 16:35:18 -07:00
2015-04-15 16:35:17 -07:00
2015-04-15 16:35:19 -07:00
2014-12-13 12:42:48 -08:00
2015-04-15 16:35:18 -07:00
2014-12-02 17:32:07 -08:00
2015-02-12 18:54:28 -08:00
2015-02-11 17:06:07 -08:00
2015-02-12 18:54:10 -08:00
2015-02-12 18:54:12 -08:00
2015-02-12 18:54:12 -08:00
2015-04-15 16:35:22 -07:00
2015-02-12 18:54:12 -08:00