Merge commit 'kumar/kumar-dma'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 2 Oct 2008 06:11:44 +0000 (16:11 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 2 Oct 2008 06:11:44 +0000 (16:11 +1000)

Trivial merge