| commit | 2e18e047981ae04be9bd0d9760057f7c1a7b3785 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Mon Feb 08 11:34:03 2010 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Mon Feb 08 11:34:03 2010 +0900 |
| tree | 999941abf466ce4d6915273e2e7a42bf0a107385 | |
| parent | b06ede84dd1473dec7c6af03a41c8d04d2fee437 [diff] | |
| parent | cfefe99795251d76d92e8457f4152f532a961ec5 [diff] |
Merge branch 'sh/dmaengine' Conflicts: arch/sh/drivers/dma/dma-sh.c