projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a88648 ffa6120)
Merge branch 'nfp-whitespace-sync-and-flower-TCP-flags'
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 Feb 2018 21:24:24 +0000 (16:24 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Feb 2018 21:24:24 +0000 (16:24 -0500)
Jakub Kicinski says:

====================
nfp: whitespace sync and flower TCP flags

Whitespace cleanup from Michael and flower offload support for matching
on TCP flags from Pieter.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge
John Crispins staging tree