diff options
| author | Linqiang Pu <dpu@nvidia.com> | 2012-05-02 21:37:27 +0800 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-05-04 00:24:30 -0700 |
| commit | 4ebcf44ba8606b3e2d267cecd7b396b846cf06b0 (patch) | |
| tree | d580bfcf82822a2be219e387ca4fa07306cb3182 /arch | |
| parent | 046a597b9cc3e2bd7b707887530827cbd607b275 (diff) | |
dmaengine/dma_slave: fix merge issue.
Change-Id: I0931f4ef7a5464dd32d8c703288a137fc77857ce
Signed-off-by: Linqiang Pu <dpu@nvidia.com>
Reviewed-on: http://git-master/r/100090
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions