Merge "ARM: dts: msm: add support for etm and cpu-cti on msmfalcon"

author Linux Build Service Account <lnxbuild@localhost>

Mon, 31 Oct 2016 20:04:00 +0000 (13:04 -0700)

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

Mon, 31 Oct 2016 20:03:59 +0000 (13:03 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Mon, 31 Oct 2016 20:04:00 +0000 (13:04 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Mon, 31 Oct 2016 20:03:59 +0000 (13:03 -0700)
diff --cc arch/arm/boot/dts/qcom/msmfalcon.dtsi
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Mon, 31 Oct 2016 20:04:00 +0000 (13:04 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Mon, 31 Oct 2016 20:03:59 +0000 (13:03 -0700)