David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
nfp	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07: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