projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ef6c5be 703fb94)
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)
commit5e7873d1450e1809b017b943417530db3955ac5f
treeeee7e724fa10e0cccb5f10707bce247d7eba721btree | snapshot
parentef6c5be658f6a70c1256fbd18e18ee0dc24c3386commit | diff
parent703fb94ec58e0e8769380c2877a8a34aeb5b6c97commit | diff
Merge branch 'master' of git://git./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>
John Crispins staging tree