From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 20 Aug 2015 23:10:19 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net... 
X-Git-Tag: omap-for-v4.3/fixes-rc1~110^2~117^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91;p=pandora-kernel.git

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>
---

81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91
Reading git-diff-tree failed