Merge "ARM: dts: msm: configure default CMA region for sdm660"

author Linux Build Service Account <lnxbuild@localhost>

Tue, 17 Jan 2017 07:06:04 +0000 (23:06 -0800)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Tue, 17 Jan 2017 07:06:04 +0000 (23:06 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Tue, 17 Jan 2017 07:06:04 +0000 (23:06 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Tue, 17 Jan 2017 07:06:04 +0000 (23:06 -0800)
diff --cc arch/arm/boot/dts/qcom/sdm660.dtsi
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Tue, 17 Jan 2017 07:06:04 +0000 (23:06 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Tue, 17 Jan 2017 07:06:04 +0000 (23:06 -0800)