]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit336d17f9392b675ecc8426685d7b43a14ec8ab55
treea12562009ae984dd16ed080af13d0036b88a93a7
parent53cafc93af358180cc56a82f33ee63082ff51b5a
parentf62cce356cbd5e2552f1bf4aa09833954a888be5
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