Merge branch 'sa11x0-dma' into sa11x0-ir
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 7 Mar 2012 11:46:12 +0000 (11:46 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 7 Mar 2012 11:46:12 +0000 (11:46 +0000)

Trivial merge