tree eee7e724fa10e0cccb5f10707bce247d7eba721b
parent ef6c5be658f6a70c1256fbd18e18ee0dc24c3386
parent 703fb94ec58e0e8769380c2877a8a34aeb5b6c97
author David S. Miller <davem@davemloft.net> 1353615870 -0500
committer David S. Miller <davem@davemloft.net> 1353615870 -0500

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

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>