| commit | 7d9d43ace29be375d3d1654b688b94029308a1be | [log] [tgz] |
|---|---|---|
| author | Vinod Koul <vinod.koul@intel.com> | Sat Oct 31 07:36:55 2015 +0530 |
| committer | Vinod Koul <vinod.koul@intel.com> | Sat Oct 31 07:36:55 2015 +0530 |
| tree | b5dd459d5cd5541636f09342a5d9a08dd3822af8 | |
| parent | 6df056d8e69a557ac76bc7a88960e4addbc98386 [diff] | |
| parent | e3faf2b8826b8ac58cdaad7f801e59e389320f0e [diff] |
Merge branch 'topic/edma' into for-linus Signed-off-by: Vinod Koul <vinod.koul@intel.com> Conflicts: drivers/dma/edma.c