David S. Miller 375ca548f7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two easily resolvable overlapping change conflicts, one in
TCP and one in the eBPF verifier.

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

2019-02-20 00:34:07 -08:00

..

cpmac.c

net: ti: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles

2019-01-28 23:09:19 -08:00

cpsw_ale.c

net: ethernet: ti: cpsw_ale: use const for API having pointer on mac address

2018-10-15 22:21:27 -07:00

cpsw_ale.h

net: ethernet: ti: cpsw_ale: use const for API having pointer on mac address

2018-10-15 22:21:27 -07:00

cpsw-common.c

net: ti: cpsw-common: dont print error if ti_cm_get_macid() fails

2017-08-30 10:05:07 -07:00

cpsw-phy-sel.c

net: ethernet: ti: cpsw-phy-sel: remove unneeded semicolon

2019-01-17 22:05:16 -08:00

cpsw.c

Merge tag 'usb-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2018-12-28 20:30:00 -08:00

cpsw.h

net: ethernet: ti: cpsw: move mac_hi/lo defines in cpsw.h

2017-12-01 16:36:32 -05:00

cpts.c

net: (cpts) fix a missing check of clk_prepare

2018-12-27 16:20:23 -08:00

cpts.h

net: ethernet: ti: cpts: move enable/disable flags outside of cpts module

2018-11-13 16:29:59 -08:00

davinci_cpdma.c

net: ethernet: ti: cpdma: fit rated channels in backward order

2018-07-23 20:34:36 -07:00

davinci_cpdma.h

net: ethernet: ti: cpsw: enable vlan rx vlan offload

2018-03-17 19:51:01 -04:00

davinci_emac.c

net: davinci_emac: use nvmem_get_mac_address()

2018-12-03 15:40:30 -08:00

davinci_mdio.c

net: davinci: fix building davinci mdio code without CONFIG_OF

2018-05-30 13:21:23 -04:00

Kconfig

net: documentation: build a directory structure for drivers

2018-12-05 11:30:06 -08:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

netcp_core.c

net: netcp: Fix ethss driver probe issue

2019-02-18 17:49:24 -08:00

netcp_ethss.c

net: Use of_node_name_eq for node name comparisons

2018-12-05 20:51:05 -08:00

netcp_sgmii.c

net: netcp: Fixes SGMII reset on network interface shutdown

2015-07-27 01:14:26 -07:00

netcp_xgbepcsr.c

net: netcp: Enhance GBE driver to support 10G Ethernet

2015-01-19 15:07:39 -05:00

netcp.h

net: netcp: add api to support set rx mode in netcp modules

2018-04-18 21:00:57 -04:00

tlan.c

net: documentation: build a directory structure for drivers

2018-12-05 11:30:06 -08:00

tlan.h

tlan: Don't scream if no link

2014-07-07 17:06:52 -07:00