]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1db74e1 85dfb74)
Merge remote-tracking branch 'ipsec/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 23:46:33 +0000 (10:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 23:46:33 +0000 (10:46 +1100)
1  2 
net/key/af_key.c patch | diff1 | diff2 | blob | history

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