projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3647d34 dd82088)
Merge branch 'master' of git://1984.lsi.us.es/nf
authorDavid S. Miller <davem@davemloft.net>
Tue, 26 Feb 2013 22:24:26 +0000 (17:24 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Feb 2013 22:24:26 +0000 (17:24 -0500)
commitb86c761f691d4f8f16b5a40c3d6b71c62e4cb04d
tree611d2648429eff830a6c4047e12e108fef3173f4tree | snapshot
parent3647d3450a494e0bea49403a7c3b625db1ebe57fcommit | diff
parentdd82088dab3646ed28e4aa43d1a5b5d5ffc2afbacommit | diff
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>
net/netfilter/ipset/ip_set_core.c diff1 | diff2 | blob | history
Domain: System / Kernel;