projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 939ccba 9f0d3c2)
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)
To obtain new flag FLOWI_FLAG_KNOWN_NH to fix netfilter's xt_TEE target.


Trivial merge