summaryrefslogtreecommitdiffstats
path: root/include/linux/netfilter/nfnetlink.h
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2013-11-23 23:50:17 +0100
committerFlorian Westphal <fw@strlen.de>2013-11-23 23:50:17 +0100
commit73dcee35a394b0fcf83f99d278bc03515de07d4b (patch)
treec7adf02dcfeceb736ff151ab029f82670eec361e /include/linux/netfilter/nfnetlink.h
parent482c6d3731e2681cb4baae835c294840300197e6 (diff)
parent76e230e41947576efb96e86e605bb84015cdb287 (diff)
Merge branch 'stable-1.4.20'
... to get 76e230e ('iptables: link against libnetfilter_conntrack'), else static build doesn't work. Conflicts: extensions/GNUmakefile.in [ CPPFLAGS was added in master, so keep it ] Reported-By: Gustavo Zacarias <gustavo@zacarias.com.ar>
Diffstat (limited to 'include/linux/netfilter/nfnetlink.h')
0 files changed, 0 insertions, 0 deletions