Merge branches 'fixes' and 'ioremap' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Jul 2015 11:35:33 +0000 (12:35 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Jul 2015 11:35:33 +0000 (12:35 +0100)

Trivial merge