Merge branch 'devel-stable' into misc
authorRussell King <rmk+kernel@armlinux.org.uk>
Tue, 28 Feb 2017 11:05:54 +0000 (11:05 +0000)
committerRussell King <rmk+kernel@armlinux.org.uk>
Tue, 28 Feb 2017 11:05:54 +0000 (11:05 +0000)

Trivial merge