]> www.infradead.org Git - users/hch/block.git/commitdiff
projects / users / hch / block.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a90b25 529adfe)
Merge remote-tracking branch 'file-locks/locks-next' into master
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Oct 2020 22:47:33 +0000 (09:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Oct 2020 22:47:33 +0000 (09:47 +1100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.