From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Tue, 22 May 2012 06:55:43 +0000 (+0200)
Subject: Merge branch 'for-next-arm-dma' into for-linus
X-Git-Tag: v3.5-rc1~81^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f51596bd39a5c928307ffcffc9ba07f90f42a8b;p=pandora-kernel.git

Merge branch 'for-next-arm-dma' into for-linus

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/dma-mapping.c

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

0f51596bd39a5c928307ffcffc9ba07f90f42a8b
Reading git-diff-tree failed