tree e7602057216d3de837995b267a281ae09d899a26
parent 939ccba437da1726a5c8a5b702a47d473da927ae
parent 9f0d3c2781baa1102108e16efbe640dd74564a7c
author Pablo Neira Ayuso <pablo@netfilter.org> 1350464360 +0200
committer Pablo Neira Ayuso <pablo@netfilter.org> 1350464360 +0200

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.