]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit29861cec6aeb846e75fa1c9a2f910d7fdccbeaf8
treeeee7e724fa10e0cccb5f10707bce247d7eba721b
parent2b01b9c34d5d7b9876578d67987ec8a99c19c8a8
parentd97eafbaa7d02bfce60c3e007895653ebe8c1fde
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>