]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ipsec/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Apr 2014 23:57:05 +0000 (09:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Apr 2014 23:57:05 +0000 (09:57 +1000)
commit171fe59f67f0ff9ae9b95e8bdbd89d9735b76224
tree3bf7b94882c011cc992bd8d020e91319670f0830
parentc9b8e2742ca45448fea40708730f4404778e6d89
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