]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ipsec-next/master'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:31:31 +0000 (11:31 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:31:31 +0000 (11:31 +0200)
commite68a27dd2caed032e93964613ddbc0fe79508e6e
tree4aeea6568b1ba94e97b2971b71b68af7ad717c32
parentd05ba4f02dc373ee88239f3f4f037d02cec6188a
parent4d53eff48b5f03ce67f4f301d6acca1d2145cb7a
Merge remote-tracking branch 'ipsec-next/master'

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