Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unstable...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Apr 2014 23:33:32 +0000 (00:33 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Apr 2014 23:33:32 +0000 (00:33 +0100)

Trivial merge