David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-08 15:00:17 -08:00
..
common	net: cavium: clean up return value check in cavium_ptp_probe	2018-11-23 17:26:07 -08:00
liquidio	liquidio: Implement ndo_get_port_parent_id()	2019-02-06 14:16:11 -08:00
octeon	net: ethernet: Convert phydev advertize and supported from u32 to link mode	2018-11-11 10:10:01 -08:00
thunder	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
Kconfig	net: Don't default Cavium PTP driver to 'y'	2019-02-06 19:48:15 -08:00
Makefile	net: add support for Cavium PTP coprocessor	2018-01-16 14:31:14 -05:00