David S. Miller f83f715195 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor comment merge conflict in mlx5. Staging driver has a fixup due to the skb->xmit_more changes in 'net-next', but was removed in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-05 14:14:19 -07:00
..
nfp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-04-05 14:14:19 -07:00
Kconfig	net: devlink: select NET_DEVLINK from drivers	2019-03-24 14:55:31 -04:00
Makefile	nfp: rename the driver and add new main file	2017-02-10 15:52:24 -05:00