Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 5 Dec 2014 16:30:54 +0000 (16:30 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 5 Dec 2014 16:30:54 +0000 (16:30 +0000)

Trivial merge