git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8cfd23e
938049e
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net...
author
Pablo Neira Ayuso
<pablo@netfilter.org>
Thu, 20 Aug 2015 23:10:19 +0000
(
01:10
+0200)
committer
Pablo Neira Ayuso
<pablo@netfilter.org>
Fri, 21 Aug 2015 04:09:05 +0000
(06:09 +0200)
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>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff