Merge branches 'mmci' and 'pl011-dma' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:08:31 +0000 (18:08 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:08:31 +0000 (18:08 +0000)

Trivial merge