summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-11-23 00:27:18 +0400
committerDavid S. Miller <davem@davemloft.net>2012-11-23 00:27:18 +0400
commit84ec95b047d2d02552f07c06d9d6da8b61532090 (patch)
tree3fc7861a6a2d1ad22722bb905bd3731623463f0f /scripts
parent5e7873d1450e1809b017b943417530db3955ac5f (diff)
parente93b5f9f320db431ec8623a4c667811007e07fd7 (diff)
downloadlinux-84ec95b047d2d02552f07c06d9d6da8b61532090.tar.xz
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>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions