David S. Miller a06ee256e5 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Version bump conflict in batman-adv, take what's in net-next. iavf conflict, adjustment of netdev_ops in net-next conflicting with poll controller method removal in net. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-09-25 10:35:29 -07:00
..
nfp	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -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