From: Mark Brown <broonie@linaro.org>
Date: Mon, 12 May 2014 17:21:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-dma' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~130^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d1e204cb01af58a80ee4b77eb957a69833fb502c;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/arm64-dma' into linux-linaro-lsk

Conflicts:
	arch/arm64/mm/dma-mapping.c
	arch/arm64/mm/init.c
---

d1e204cb01af58a80ee4b77eb957a69833fb502c