]> nv-tegra.nvidia Code Review - linux-2.6.git/commit - mm
Merge branch 'sh/dmaengine'
authorPaul Mundt <lethal@linux-sh.org>
Mon, 8 Feb 2010 02:34:03 +0000 (11:34 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 8 Feb 2010 02:34:03 +0000 (11:34 +0900)
commit2e18e047981ae04be9bd0d9760057f7c1a7b3785
tree999941abf466ce4d6915273e2e7a42bf0a107385
parentb06ede84dd1473dec7c6af03a41c8d04d2fee437
parentcfefe99795251d76d92e8457f4152f532a961ec5
Merge branch 'sh/dmaengine'

Conflicts:
arch/sh/drivers/dma/dma-sh.c
arch/sh/drivers/dma/dma-sh.c
arch/sh/include/asm/dma-sh.h