David S. Miller 6f41617bf2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net' overlapped the renaming of a netlink attribute in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-10-03 21:00:17 -07:00
..
nfp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-03 21:00:17 -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