David S. Miller 68aaf44595 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-08-27 14:23:31 -07:00

..

cpmac.c

…

cpsw_ale.c

…

cpsw_ale.h

…

cpsw_ethtool.c

net: ethernet: ti: cpsw: add XDP support

2019-07-08 14:58:04 -07:00

cpsw_priv.c

…

cpsw_priv.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2019-07-08 19:48:57 -07:00

cpsw_sl.c

…

cpsw_sl.h

…

cpsw-common.c

…

cpsw-phy-sel.c

…

cpsw.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-08-27 14:23:31 -07:00

cpsw.h

…

cpts.c

…

cpts.h

…

davinci_cpdma.c

davinci_cpdma: don't cast dma_addr_t to pointer

2019-07-12 15:19:37 -07:00

davinci_cpdma.h

net: ethernet: ti: davinci_cpdma: allow desc split while down

2019-07-08 14:58:04 -07:00

davinci_emac.c

Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2019-07-12 12:24:03 -07:00

davinci_mdio.c

…

Kconfig

net: ethernet: ti: cpsw: add XDP support

2019-07-08 14:58:04 -07:00

Makefile

…

netcp_core.c

net: Use skb_frag_off accessors

2019-07-30 14:21:32 -07:00

netcp_ethss.c

…

netcp_sgmii.c

…

netcp_xgbepcsr.c

…

netcp.h

…

tlan.c

ethernet: remove redundant memset

2019-07-15 11:06:27 -07:00

tlan.h

…