]> 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: 432ebe8 933c32f)
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 23:52:47 +0000 (10:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 23:52:47 +0000 (10:52 +1100)
1  2 
fs/ecryptfs/main.c patch | diff1 | diff2 | blob | history

diff --cc fs/ecryptfs/main.c
Simple merge
Linux kernel for KaRo TX COM modules