From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 8 Feb 2010 02:34:03 +0000 (+0900)
Subject: Merge branch 'sh/dmaengine'
X-Git-Tag: v2.6.34-rc1~285^2~40
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e18e047981ae04be9bd0d9760057f7c1a7b3785;p=pandora-kernel.git

Merge branch 'sh/dmaengine'

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

2e18e047981ae04be9bd0d9760057f7c1a7b3785
Reading git-diff-tree failed