]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ipsec/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 May 2014 00:27:17 +0000 (10:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 May 2014 00:27:17 +0000 (10:27 +1000)
commit506528b7ca6b992e3ecceced5ee1c2c5c8d6a3ae
tree3d11d7b342bd76b12656d95472944d4767b2ba54
parenta75c4168b260d653b3810c3f5889c94d5fcde4a9
parenta32452366b7250c42e96a18ffc3ad8db9e0ca3c2
Merge remote-tracking branch 'ipsec/master'

Conflicts:
net/ipv4/ip_vti.c
net/ipv4/ip_vti.c
net/ipv4/xfrm4_output.c
net/ipv6/xfrm6_output.c