| commit | 84ec95b047d2d02552f07c06d9d6da8b61532090 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Nov 22 15:27:18 2012 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Thu Nov 22 15:27:18 2012 -0500 |
| tree | 3fc7861a6a2d1ad22722bb905bd3731623463f0f | |
| parent | 5e7873d1450e1809b017b943417530db3955ac5f [diff] | |
| parent | e93b5f9f320db431ec8623a4c667811007e07fd7 [diff] |
Merge branch 'master' of git://1984.lsi.us.es/nf Pablo Neira Ayuso says: ==================== The following patchset contains two Netfilter fixes: * Fix buffer overflow in the name of the timeout policy object in the cttimeout infrastructure, from Florian Westphal. * Fix a bug in the hash set in case that IP ranges are specified, from Jozsef Kadlecsik. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>