Merge branch 'rmk_cookie_fixes2' into next
authorVinod Koul <vinod.koul@linux.intel.com>
Tue, 13 Mar 2012 07:09:49 +0000 (12:39 +0530)
committerVinod Koul <vinod.koul@linux.intel.com>
Tue, 13 Mar 2012 07:09:49 +0000 (12:39 +0530)
commit1f3d6dc0be92f0caca937926cca16ec4fdd585a3
treea12562009ae984dd16ed080af13d0036b88a93a7
parent5170c051a56244816d948c43592c1b2805ed4f3a
parent949ff5b8d46b5e3435d21b2651ce3a2599208d44
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>
drivers/dma/imx-dma.c
drivers/dma/imx-sdma.c
drivers/dma/pl330.c