Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 10 Feb 2015 10:26:38 +0000 (10:26 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 10 Feb 2015 10:26:38 +0000 (10:26 +0000)

Trivial merge