Merge branch 'devel-stable' into for-linus
authorRussell King <rmk+kernel@armlinux.org.uk>
Mon, 22 Feb 2021 13:09:55 +0000 (13:09 +0000)
committerRussell King <rmk+kernel@armlinux.org.uk>
Mon, 22 Feb 2021 13:09:55 +0000 (13:09 +0000)

Trivial merge