| commit | b86c761f691d4f8f16b5a40c3d6b71c62e4cb04d | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Feb 26 17:24:26 2013 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Tue Feb 26 17:24:26 2013 -0500 |
| tree | 611d2648429eff830a6c4047e12e108fef3173f4 | |
| parent | 3647d3450a494e0bea49403a7c3b625db1ebe57f [diff] | |
| parent | dd82088dab3646ed28e4aa43d1a5b5d5ffc2afba [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>