Merge branch 'pending-dma-coherent' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 15:00:00 +0000 (15:00 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 15:00:00 +0000 (15:00 +0000)

Trivial merge