Skip to content
Commit 0b4f5b1d authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

To obtain new flag FLOWI_FLAG_KNOWN_NH to fix netfilter's xt_TEE target.
parents 939ccba4 9f0d3c27
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment