Merge remote-tracking branch 'ipsec/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 22:59:34 +0000 (09:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 22:59:34 +0000 (09:59 +1100)
commitbdc15ce316507225587552a3e63e7e09d94b81be
treecab2bd305d6c5ba622a019c1abd94f56ec764cee
parentdd6560cf63e1a76f425b010a262bd89e46af0880
parenta8a572a6b5f2a79280d6e302cb3c1cb1fbaeb3e8
Merge remote-tracking branch 'ipsec/master'
net/ipv4/xfrm4_policy.c
net/ipv6/xfrm6_policy.c
net/xfrm/xfrm_policy.c