Merge branches 'fixes' and 'mmci' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 20 Feb 2013 14:35:45 +0000 (14:35 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 20 Feb 2013 14:35:45 +0000 (14:35 +0000)

Trivial merge