]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorDavid S. Miller <davem@davemloft.net>
Thu, 22 Nov 2012 20:24:30 +0000 (15:24 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Nov 2012 20:24:30 +0000 (15:24 -0500)
Steffen Klassert says:

====================
This pull request is intended for 3.7 and contains a single patch to
fix the IPsec gc threshold value for ipv4.
====================

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

Trivial merge