Merge "ARM: dts: msm: Enable memory allocation for diag on falcon"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 10 Nov 2016 23:14:37 +0000 (15:14 -0800)

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

Thu, 10 Nov 2016 23:14:36 +0000 (15:14 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 10 Nov 2016 23:14:37 +0000 (15:14 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 10 Nov 2016 23:14:36 +0000 (15:14 -0800)
diff --cc arch/arm/boot/dts/qcom/msmfalcon.dtsi
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 10 Nov 2016 23:14:37 +0000 (15:14 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 10 Nov 2016 23:14:36 +0000 (15:14 -0800)