| commit | 0adcdeed6f87ac7230c9a0364ac785b8e70ad275 | [log] [tgz] |
|---|---|---|
| author | Vinod Koul <vinod.koul@intel.com> | Tue Jan 07 21:36:24 2014 +0530 |
| committer | Vinod Koul <vinod.koul@intel.com> | Tue Jan 07 21:36:24 2014 +0530 |
| tree | 77fd04c067b024887d801778227501762bdf2ddd | |
| parent | 4fce628f685945df4fd6fa1cab6f7eb397dc9267 [diff] | |
| parent | 8010dad55a0ab0e829f3733854e5235eef4e2734 [diff] |
Merge branch 'topic/of' into for-linus Conflicts: drivers/dma/mmp_pdma.c Signed-off-by: Vinod Koul <vinod.koul@intel.com>