Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 17 Oct 2012 08:59:20 +0000 (10:59 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 17 Oct 2012 08:59:20 +0000 (10:59 +0200)
commit0b4f5b1d6385826093dc3cd9035b186f0d77a5dc
treee7602057216d3de837995b267a281ae09d899a26
parent939ccba437da1726a5c8a5b702a47d473da927ae
parent9f0d3c2781baa1102108e16efbe640dd74564a7c
Merge branch 'master' of git://git./linux/kernel/git/davem/net

To obtain new flag FLOWI_FLAG_KNOWN_NH to fix netfilter's xt_TEE target.