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
..
2014-10-12 10:13:55 -04:00
2015-04-22 08:00:42 +10:00
2014-11-24 22:43:57 +08:00
2015-03-31 21:21:04 +08:00
2015-01-26 11:34:22 +11:00
2014-12-22 23:02:35 +11:00
2015-01-13 22:29:11 +11:00
2015-05-11 10:50:17 -04:00
2015-01-26 11:34:22 +11:00
2015-04-15 20:26:16 -07:00
2013-06-25 19:15:17 +08:00
2015-05-18 12:13:06 +08:00
2015-04-11 15:53:35 -04:00
2015-04-15 10:42:15 -07:00
2015-04-11 15:53:35 -04:00
2015-03-09 21:06:18 +11:00
2014-11-24 22:43:57 +08:00
2015-03-31 21:21:03 +08:00
2014-11-24 22:43:57 +08:00
2014-11-26 20:06:30 +08:00
2014-11-26 20:06:30 +08:00
2014-03-10 20:17:11 +08:00
2011-09-22 21:25:25 +10:00
2015-01-13 22:29:11 +11:00
2015-01-13 22:29:11 +11:00
2015-01-13 22:29:11 +11:00
2015-01-13 22:29:11 +11:00
2013-08-14 20:42:03 +10:00
2014-11-26 20:06:30 +08:00
2014-11-26 20:06:30 +08:00
2014-11-26 20:06:30 +08:00
2010-02-16 20:31:37 +08:00
2014-11-26 20:06:30 +08:00
2010-02-16 20:31:04 +08:00
2014-11-24 22:43:57 +08:00
2015-01-13 22:29:11 +11:00
2013-09-12 15:31:34 +10:00
2015-01-13 22:29:11 +11:00
2015-03-31 21:21:04 +08:00
2014-11-24 22:43:57 +08:00
2015-04-08 22:20:06 +08:00
2014-03-21 21:54:28 +08:00
2014-11-26 20:06:30 +08:00
2015-01-20 14:44:15 +11:00
2014-11-24 22:43:57 +08:00
2015-01-13 22:29:11 +11:00
2015-03-09 21:06:18 +11:00
2014-11-26 20:06:30 +08:00
2014-11-26 20:06:30 +08:00
2014-11-24 22:43:57 +08:00
2008-08-29 15:50:02 +10:00
2014-11-26 20:06:30 +08:00
2011-07-08 17:21:21 +08:00
2015-01-13 22:29:11 +11:00
2013-10-25 17:14:03 -04:00
2014-11-26 20:06:30 +08:00
2013-06-25 19:15:17 +08:00
2015-04-07 21:34:20 +08:00
2014-11-24 22:43:57 +08:00
2015-01-13 22:29:11 +11:00
2014-11-26 20:06:30 +08:00
2014-11-24 22:43:57 +08:00
2014-11-24 22:43:57 +08:00
2014-11-24 22:43:57 +08:00
2015-03-04 22:12:39 +13:00
2015-03-31 21:21:13 +08:00
2014-11-24 22:43:57 +08:00
2014-11-24 22:43:57 +08:00
2013-12-09 20:09:12 +08:00
2014-11-24 22:43:57 +08:00
2014-11-26 20:06:30 +08:00
2013-02-19 20:27:03 +08:00
2014-11-26 20:06:30 +08:00
2015-03-31 21:21:04 +08:00
2008-07-10 20:35:12 +08:00
2014-11-24 22:43:57 +08:00
2014-11-24 22:43:57 +08:00
2014-11-24 22:43:57 +08:00
2014-11-24 22:43:57 +08:00
2013-02-19 20:27:03 +08:00
2015-01-13 22:29:11 +11:00
2015-01-26 11:34:22 +11:00
2014-11-24 22:43:57 +08:00
2015-01-20 14:44:16 +11:00
2015-01-13 22:29:11 +11:00
2015-04-10 21:39:40 +08:00
2015-04-10 21:39:41 +08:00
2015-04-10 21:39:41 +08:00
2014-06-07 11:44:39 -07:00
2015-03-12 01:11:05 +11:00
2013-12-20 20:06:25 +08:00
2015-01-13 22:29:11 +11:00
2015-03-31 21:21:03 +08:00
2014-08-29 21:46:36 +08:00
2015-01-13 22:29:11 +11:00
2011-11-09 11:53:32 +08:00
2015-01-13 22:29:11 +11:00
2014-11-26 20:06:30 +08:00
2015-01-13 22:29:11 +11:00
2014-11-26 20:06:30 +08:00
2012-10-11 13:42:32 +11:00
2014-11-26 20:06:30 +08:00
2014-11-24 22:43:57 +08:00