Merge branches 'misc' and 'devel-stable' into for-linus
authorRussell King <rmk+kernel@armlinux.org.uk>
Thu, 2 Apr 2020 18:42:29 +0000 (19:42 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Thu, 2 Apr 2020 18:42:29 +0000 (19:42 +0100)

Trivial merge