From: David S. Miller <davem@davemloft.net>
Date: Tue, 26 Feb 2013 22:24:26 +0000 (-0500)
Subject: Merge branch 'master' of git://1984.lsi.us.es/nf
X-Git-Tag: v3.9~263^2~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b86c761f691d4f8f16b5a40c3d6b71c62e4cb04d;p=platform%2Fkernel%2Flinux-amlogic.git

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

Pablo Neira Ayuso says:

====================
The following patchset contains two bugfixes for netfilter/ipset via
Jozsef Kadlecsik, they are:

* Fix timeout corruption if sets are resized, by Josh Hunt.

* Fix bogus error report if the flag nomatch is set, from Jozsef.
====================

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

b86c761f691d4f8f16b5a40c3d6b71c62e4cb04d