Merge "ARM: dts: msm: Increase ADSP ion heap by 4 MB for msmcobalt"

author Linux Build Service Account <lnxbuild@localhost>

Fri, 15 Jul 2016 21:34:47 +0000 (14:34 -0700)

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

Fri, 15 Jul 2016 21:34:47 +0000 (14:34 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Fri, 15 Jul 2016 21:34:47 +0000 (14:34 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Fri, 15 Jul 2016 21:34:47 +0000 (14:34 -0700)
diff --cc arch/arm/boot/dts/qcom/msmcobalt.dtsi
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Fri, 15 Jul 2016 21:34:47 +0000 (14:34 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Fri, 15 Jul 2016 21:34:47 +0000 (14:34 -0700)