Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 21 Jan 2014 21:26:51 +0000 (21:26 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 21 Jan 2014 21:26:51 +0000 (21:26 +0000)

Trivial merge