Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 17 Mar 2011 11:04:51 +0000 (11:04 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 17 Mar 2011 11:04:51 +0000 (11:04 +0000)

Trivial merge