Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 May 2011 18:27:40 +0000 (19:27 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 May 2011 18:27:40 +0000 (19:27 +0100)

Trivial merge