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