David S. Miller 8b44836583 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two easy cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-25 23:52:29 -04:00
..
cls.c	nfp: abm: fix spelling mistake "offseting" -> "offsetting"	2019-04-17 23:22:26 -07:00
ctrl.c	nfp: add a mutex lock for the vNIC ctrl BAR	2019-04-12 17:29:15 -07:00
main.c	nfp: allow fallback packets from non-reprs	2019-04-15 15:45:36 -07:00
main.h	nfp: abm: allow to opt-out of RED offload	2018-12-16 12:41:42 -08:00
qdisc.c	nfp: abm: add support for more threshold actions	2018-11-19 18:53:46 -08:00