From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Tue, 13 Mar 2012 07:09:49 +0000 (+0530)
Subject: Merge branch 'rmk_cookie_fixes2' into next
X-Git-Tag: v3.4-rc1~39^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f3d6dc0be92f0caca937926cca16ec4fdd585a3;p=pandora-kernel.git

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>
---

1f3d6dc0be92f0caca937926cca16ec4fdd585a3
Reading git-diff-tree failed