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-09 11:35:48 +03:00
2015-03-25 15:04:57 +01:00
2014-04-30 19:49:37 +01:00
2014-08-06 18:01:25 -07:00
2015-02-12 18:54:15 -08:00
2015-02-12 18:54:15 -08:00
2014-05-05 09:09:14 +02:00
2014-08-08 15:57:25 -07:00
2015-02-12 18:54:15 -08:00
2015-02-24 08:44:16 +01:00
2015-02-12 18:54:15 -08:00
2014-06-25 17:45:43 -07:00
2015-01-21 16:28:49 +10:30
2015-02-12 18:54:16 -08:00
2015-03-23 22:12:08 -04:00
2015-02-12 18:54:16 -08:00
2015-04-16 19:02:04 -04:00
2015-02-13 21:21:41 -08:00
2013-04-29 18:28:42 -07:00