tree 999941abf466ce4d6915273e2e7a42bf0a107385
parent b06ede84dd1473dec7c6af03a41c8d04d2fee437
parent cfefe99795251d76d92e8457f4152f532a961ec5
author Paul Mundt <lethal@linux-sh.org> 1265596443 +0900
committer Paul Mundt <lethal@linux-sh.org> 1265596443 +0900

Merge branch 'sh/dmaengine'

Conflicts:
	arch/sh/drivers/dma/dma-sh.c