Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Wed, 28 Oct 2020 14:20:42 +0000 (23:20 +0900)
committerTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Wed, 28 Oct 2020 14:20:42 +0000 (23:20 +0900)

Trivial merge