Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 12 Nov 2013 10:59:08 +0000 (10:59 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 12 Nov 2013 10:59:08 +0000 (10:59 +0000)

Trivial merge