]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ipsec/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 May 2014 23:49:18 +0000 (09:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 May 2014 23:49:18 +0000 (09:49 +1000)
commit1916bdfb528fc83d140910e0c631a7326aa12fd9
treeb2e07a8cadf1552b9e9a061b709b1565a5249980
parent78ead72db0e68c392a99d5c44153816973070b0b
parent6d004d6cc73920299adf4cfe25010b348fc94395
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