Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', ...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 22 Jul 2011 22:08:48 +0000 (23:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 22 Jul 2011 22:08:48 +0000 (23:08 +0100)

Trivial merge