David S. Miller 6b0a7f84ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-17 11:26:25 -07:00
..
common	net: cavium: clean up return value check in cavium_ptp_probe	2018-11-23 17:26:07 -08:00
liquidio	net: move skb->xmit_more hint to softnet data	2019-04-01 18:35:02 -07:00
octeon	net: ethernet: Convert phydev advertize and supported from u32 to link mode	2018-11-11 10:10:01 -08:00
thunder	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-04-17 11:26:25 -07:00
Kconfig	net: devlink: select NET_DEVLINK from drivers	2019-03-24 14:55:31 -04:00
Makefile	net: add support for Cavium PTP coprocessor	2018-01-16 14:31:14 -05:00