Merge branch 'devel-stable' into for-linus
authorRussell King <[email protected]>
Thu, 6 Oct 2016 07:57:07 +0000 (08:57 +0100)
committerRussell King <[email protected]>
Thu, 6 Oct 2016 07:57:07 +0000 (08:57 +0100)

Trivial merge