]> 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: 2faa85c 9e78d14)
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 00:38:01 +0000 (10:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 00:38:01 +0000 (10:38 +1000)
1  2 
fs/ecryptfs/inode.c patch | diff1 | diff2 | blob | history

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