]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dac023a 902af36)
Merge remote-tracking branch 'ecryptfs/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 00:47:18 +0000 (10:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 00:47:18 +0000 (10:47 +1000)
1  2 
fs/ecryptfs/crypto.c patch | diff1 | diff2 | blob | history

diff --cc fs/ecryptfs/crypto.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.