Merge branches 'devel-stable', 'fixes' and 'mmci' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 3 Mar 2013 00:32:50 +0000 (00:32 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 3 Mar 2013 00:32:50 +0000 (00:32 +0000)

Trivial merge