projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8cfd23e 938049e)
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)
commit81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91
tree40370ca95f416fd88cb93e5c252623e282b3553etree | snapshot
parent8cfd23e6740158817d2045915f6ea5a2daf11bcecommit | diff
parent938049e18dca57bcd2f93986fc1cbb5a83cdf027commit | diff
Merge branch 'master' of git://git./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 diff1 | diff2 | blob | history
net/netfilter/nf_synproxy_core.c diff1 | diff2 | blob | history
net/netfilter/xt_CT.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.