]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ipsec-next/master'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:35:29 +0000 (14:35 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:35:29 +0000 (14:35 +0200)
commitd12775f173bb9ca71bd2ded4b4c4d78a3735020a
tree5dda4f597aed6f4b13044ae91dc40f0af39b21f9
parentd09f4bdc4b8feadbb3326d4e6e0890556b19bf07
parent4d53eff48b5f03ce67f4f301d6acca1d2145cb7a
Merge remote-tracking branch 'ipsec-next/master'

Conflicts:
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_ipcomp.c
net/xfrm/xfrm_policy.c