]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 00:12:52 +0000 (10:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 00:12:52 +0000 (10:12 +1000)
commitcda4a785eb74afd37d4fa9ba33e50ab369646393
tree7aea3dcf6cc6049415a1f2d801b95dd962cb9542
parent7c0741fab011076f6eeabca5bad2805e78ccf69f
parent9e78d14a9f641c0476f733f6fc559ba5cac6f52b
Merge remote-tracking branch 'ecryptfs/next'
fs/ecryptfs/inode.c