Merge branch 'dma-size' of git://git.yxit.co.uk/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 23 Aug 2011 09:54:45 +0000 (10:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 23 Aug 2011 09:54:45 +0000 (10:54 +0100)

Trivial merge