David S. Miller 5cd3da4ba2 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Simple overlapping changes in stmmac driver. Adjust skb_gro_flush_final_remcsum function signature to make GRO list changes in net-next, as per Stephen Rothwell's example merge resolution. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-03 10:29:26 +09:00
..
nfp	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-03 10:29:26 +09:00
Kconfig	nfp: abm: add initial active buffer management NIC skeleton	2018-05-23 14:26:18 -04:00
Makefile	nfp: rename the driver and add new main file	2017-02-10 15:52:24 -05:00