]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b1cb2b 2e71029)
Merge remote-tracking branch 'ipsec-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 01:58:12 +0000 (11:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 01:58:12 +0000 (11:58 +1000)
1  2 
net/xfrm/xfrm_user.c patch | diff1 | diff2 | blob | history

diff --cc net/xfrm/xfrm_user.c
Simple merge
Linux kernel for KaRo TX COM modules