| commit | 1f3d6dc0be92f0caca937926cca16ec4fdd585a3 | [log] [tgz] |
|---|---|---|
| author | Vinod Koul <vinod.koul@linux.intel.com> | Tue Mar 13 12:39:49 2012 +0530 |
| committer | Vinod Koul <vinod.koul@linux.intel.com> | Tue Mar 13 12:39:49 2012 +0530 |
| tree | a12562009ae984dd16ed080af13d0036b88a93a7 | |
| parent | 5170c051a56244816d948c43592c1b2805ed4f3a [diff] | |
| parent | 949ff5b8d46b5e3435d21b2651ce3a2599208d44 [diff] |
Merge branch 'rmk_cookie_fixes2' into next Conflicts: drivers/dma/imx-dma.c drivers/dma/pl330.c Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>