| commit | 81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91 | [log] [tgz] |
|---|---|---|
| author | Pablo Neira Ayuso <pablo@netfilter.org> | Fri Aug 21 01:10:19 2015 +0200 |
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | Fri Aug 21 06:09:05 2015 +0200 |
| tree | 40370ca95f416fd88cb93e5c252623e282b3553e | |
| parent | 8cfd23e6740158817d2045915f6ea5a2daf11bce [diff] | |
| parent | 938049e18dca57bcd2f93986fc1cbb5a83cdf027 [diff] |
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>