]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branches 'work.inode-type-fixes' and 'work.ecryptfs' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 21 Mar 2021 15:43:08 +0000 (11:43 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sun, 21 Mar 2021 15:43:08 +0000 (11:43 -0400)

Trivial merge