David S. Miller e561bb29b6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Trivial conflict in net/core/filter.c, a locally computed 'sdif' is now an argument to the function. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-11-28 22:10:54 -08:00
..
common	net: cavium: clean up return value check in cavium_ptp_probe	2018-11-23 17:26:07 -08:00
liquidio	mlx5-updates-2018-10-03	2018-10-04 09:48:37 -07:00
octeon	net: ethernet: Convert phydev advertize and supported from u32 to link mode	2018-11-11 10:10:01 -08:00
thunder	net: thunderx: fix NULL pointer dereference in nic_remove	2018-11-27 16:18:53 -08:00
Kconfig	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
Makefile	net: add support for Cavium PTP coprocessor	2018-01-16 14:31:14 -05:00