Merge branches 'fixes', 'mcpm', 'misc' and 'mmci' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 29 Jun 2013 10:43:28 +0000 (11:43 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 29 Jun 2013 10:43:28 +0000 (11:43 +0100)

Trivial merge