]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ipsec-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 03:39:22 +0000 (13:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 03:39:22 +0000 (13:39 +1000)
commit3db374867c17410a56142adb92ae492c2652bfbb
tree757cc95351082bad945f35b6debde12b0e789e0e
parent6f42807b6cde300622539208dbc4ecb3de5f4dda
parentfc68086ce888a10220c7c79a2a3b44cb85d4074c
Merge remote-tracking branch 'ipsec-next/master'
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_user.c