]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ipsec/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 00:53:28 +0000 (10:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 00:53:28 +0000 (10:53 +1000)
commitb16f218b59662dbbba2e9855158671997b2ff2b5
treee33aa6a3ba42dfbe88ceaaf72e9bfe3098d6347c
parentb801d8e11346d12eab4eeb6f4474b32ab2ac0ccc
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