From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Mon, 15 Jul 2013 09:13:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next
X-Git-Tag: v3.12-rc1~84^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e;p=pandora-kernel.git

Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next

Conflicts:
	mm/Kconfig

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---

f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e
Reading git-diff-tree failed