Merge branches 'devel-stable' and 'misc' into for-linus
authorRussell King <rmk+kernel@armlinux.org.uk>
Mon, 9 Apr 2018 09:08:51 +0000 (10:08 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Mon, 9 Apr 2018 09:08:51 +0000 (10:08 +0100)

Trivial merge