Merge branches 'arnd-fixes', 'clk', 'misc', 'v7' and 'fixes' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:08 +0000 (21:18 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:08 +0000 (21:18 +0100)

Trivial merge