Merge "ARM: dts: msm: clean up display device tree for MSM8996"

author Linux Build Service Account <lnxbuild@localhost>

Mon, 23 Apr 2018 08:14:46 +0000 (01:14 -0700)

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

Mon, 23 Apr 2018 08:14:46 +0000 (01:14 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Mon, 23 Apr 2018 08:14:46 +0000 (01:14 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Mon, 23 Apr 2018 08:14:46 +0000 (01:14 -0700)
diff --cc arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Mon, 23 Apr 2018 08:14:46 +0000 (01:14 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Mon, 23 Apr 2018 08:14:46 +0000 (01:14 -0700)