David S. Miller 16ae1f2236 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/genet/bcmmii.c drivers/net/hyperv/netvsc.c kernel/bpf/hashtab.c Almost entirely overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-03-23 16:41:27 -07:00
..
cpmac.c	cpmac: remove hopeless #warning	2017-01-16 11:54:36 -05:00
cpsw-common.c
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: ethernet: ti: cpsw: correct ale dev to cpsw	2017-02-17 11:12:32 -05: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	clocksource: Use a plain u64 instead of cycle_t	2016-12-25 11:04:12 +01:00
cpts.h	net: ethernet: ti: cpts: fix overflow check period	2016-12-07 11:13:48 -05:00
davinci_cpdma.c	net: ethernet: ti: davinci_cpdma: correct check on NULL in set rate	2017-01-18 16:46:01 -05:00
davinci_cpdma.h	net: ethernet: ti: cpsw: add support for ringparam configuration	2017-01-07 20:48:14 -05:00
davinci_emac.c	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
davinci_mdio.c
Kconfig	cpsw/netcp: cpts depends on posix_timers	2017-03-22 10:56:42 -07: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	mqprio: Modify mqprio to pass user parameters via ndo_setup_tc.	2017-03-15 15:20:27 -07:00
netcp_ethss.c	net: netcp: Do not clobber PHY link outside of state machine	2017-02-07 13:48:22 -05:00
netcp_sgmii.c
netcp_xgbepcsr.c
tlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-10-14 10:00:27 -04:00
tlan.h