Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 11 Apr 2014 13:50:13 +0000 (14:50 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 11 Apr 2014 13:50:13 +0000 (14:50 +0100)

Trivial merge