From: David S. Miller <davem@davemloft.net>
Date: Tue, 10 Dec 2013 01:43:21 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: upstream/snapshot3+hdmi~3773^2~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a46ff87d4b1d68814145c757b8a9199c625d840;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'master' of git://git./linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
The following patchset contains three Netfilter fixes for your net tree,
they are:

* fix incorrect comparison in the new netnet hash ipset type, from
  Dave Jones.

* fix splat in hashlimit due to missing removal of the content of its
  proc entry in netnamespaces, from Sergey Popovich.

* fix missing rule flushing operation by table in nf_tables. Table
  flushing was already discussed back in October but this got lost and
  no patch has hit the tree to address this issue so far, from me.
====================

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

6a46ff87d4b1d68814145c757b8a9199c625d840