David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The UDP offload conflict is dealt with by simply taking what is in net-next where we have removed all of the UFO handling code entirely. The TCP conflict was a case of local variables in a function being removed from both net and net-next. In netvsc we had an assignment right next to where a missing set of u64 stats sync object inits were added. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-09 16:28:45 -07:00
..
cpmac.c	cpmac: remove hopeless #warning	2017-01-16 11:54:36 -05:00
cpsw-common.c	drivers: net: cpsw-common: Fix reading of mac address for am43 SoCs	2017-06-22 11:14:47 -04:00
cpsw-phy-sel.c	drivers: net: cpsw-phy-sel: Clear RGMII_IDMODE on "rgmii" links	2016-12-07 13:12:17 -05:00
cpsw.c	net: Convert to using %pOF instead of full_name	2017-07-24 13:41:48 -07:00
cpsw.h	net: ethernet: ti: cpts: move dt props parsing to cpts driver	2016-12-07 11:13:48 -05:00
cpsw_ale.c	net: netcp: ale: add proper ale entry mask bits for netcp switch ALE	2017-01-07 21:03:50 -05:00
cpsw_ale.h	net: netcp: ale: add proper ale entry mask bits for netcp switch ALE	2017-01-07 21:03:50 -05:00
cpts.c	net: ethernet: ti: cpts: fix fifo read in cpts_find_ts	2017-08-01 15:22:55 -07:00
cpts.h	net: ethernet: ti: cpts: fix tx timestamping timeout	2017-08-01 15:22:55 -07:00
davinci_cpdma.c	net: ethernet: ti: cpdma: do not enable host error misc irq	2017-06-10 22:10:13 -04:00
davinci_cpdma.h	net: ethernet: ti: cpsw: add support for ringparam configuration	2017-01-07 20:48:14 -05:00
davinci_emac.c	net: Convert to using %pOF instead of full_name	2017-07-24 13:41:48 -07:00
davinci_mdio.c
Kconfig	cpsw/netcp: refine cpts dependency	2017-04-28 15:55:14 -04:00
Makefile	cpsw/netcp: work around reverse cpts dependency	2017-03-22 10:56:42 -07:00
netcp.h	net: netcp: use hw capability to remove FCS word from rx packets	2017-01-07 21:03:50 -05:00
netcp_core.c	net: sched: get rid of struct tc_to_netdev	2017-08-07 09:42:37 -07:00
netcp_ethss.c	net: ethernet: ti: netcp_ethss: use cpts to check if packet needs timestamping	2017-06-29 12:28:57 -04:00
netcp_sgmii.c
netcp_xgbepcsr.c
tlan.c
tlan.h