Merge branch 'devel-stable' into for-linus
authorRussell King <rmk+kernel@armlinux.org.uk>
Thu, 6 Oct 2016 07:57:07 +0000 (08:57 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Thu, 6 Oct 2016 07:57:07 +0000 (08:57 +0100)

Trivial merge