From: David S. Miller <davem@davemloft.net>
Date: Thu, 14 Feb 2013 18:16:04 +0000 (-0500)
Subject: Merge branch 'master' of git://1984.lsi.us.es/nf
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=306dbf9e5509da5aa8a787f13231442bc3ba697a;p=linux-edison.git

Merge branch 'master' of git://1984.lsi.us.es/nf

Pablo Neira Ayuso says:

====================
The following patchset contains three Netfilter fixes, they are:

* Fix conntrack helper re-assignment after NAT mangling if only if
  the same helper is attached to the conntrack again, from Florian
  Westphal.

* Don't allow the creation of conntrack entries via ctnetlink if the
  original and reply tuples are missing, from Florian Westphal.

* Fix broken sysctl interface in nf_ct_reasm while adding netns support
  to it, from Michal Kubecek.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

306dbf9e5509da5aa8a787f13231442bc3ba697a