diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-05-15 18:21:38 +0530 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-05-17 06:41:34 -0700 |
| commit | b245e73464dac33b2e1a62de7fb5959676ab133f (patch) | |
| tree | 21e5f6c0dccab8c80c3fe8dfeb8beb8c3bd01bfe /Documentation | |
| parent | 0db4788c4cc1bc77c66c34a3cee158baf7f6e507 (diff) | |
dmaengine/dma_slave: fix merge issue
Merges of dma changes from mainline reported conflict and
it was not got resolved properly.
Fix the resolution issue.
Change-Id: I7edc5effc0b9a61363e77e6cc39eb62e315396d0
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/102590
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions