]> 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: e987c3e cbe6fc4)
Merge remote-tracking branch 'file-locks/locks-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:20:37 +0000 (11:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:20:37 +0000 (11:20 +1000)
1  2 
fs/locks.c patch | diff1 | diff2 | blob | history

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