]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net...
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 20 Aug 2015 23:10:19 +0000 (01:10 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 21 Aug 2015 04:09:05 +0000 (06:09 +0200)
commitc34c436cfcf20708cc788989b40c9c4c79d79a41
tree40370ca95f416fd88cb93e5c252623e282b3553e
parent8cafdded76e8a4d30b9842511bc0ededf6541294
parenta1a7b473609e1019eb6ba1b0328a14371ad7a8bc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Resolve conflicts with conntrack template fixes.

Conflicts:
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_synproxy_core.c
net/netfilter/xt_CT.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_synproxy_core.c
net/netfilter/xt_CT.c