Merge "ARM: dts: msm: peripheral_mem carveout for msmcobalt"

author Linux Build Service Account <lnxbuild@localhost>

Sat, 16 Jul 2016 03:03:32 +0000 (20:03 -0700)

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

Sat, 16 Jul 2016 03:03:32 +0000 (20:03 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Sat, 16 Jul 2016 03:03:32 +0000 (20:03 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Sat, 16 Jul 2016 03:03:32 +0000 (20:03 -0700)
diff --cc arch/arm/boot/dts/qcom/msmcobalt.dtsi
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Sat, 16 Jul 2016 03:03:32 +0000 (20:03 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Sat, 16 Jul 2016 03:03:32 +0000 (20:03 -0700)