Merge branch 'mmci' into fixes
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 25 Jan 2011 21:18:11 +0000 (21:18 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 25 Jan 2011 21:18:11 +0000 (21:18 +0000)

Trivial merge