Merge "ARM: dts: msm: Add Nfc device to sdm630"

author Linux Build Service Account <lnxbuild@localhost>

Sat, 4 Mar 2017 01:39:18 +0000 (17:39 -0800)

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

Sat, 4 Mar 2017 01:39:17 +0000 (17:39 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Sat, 4 Mar 2017 01:39:18 +0000 (17:39 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Sat, 4 Mar 2017 01:39:17 +0000 (17:39 -0800)
diff --cc arch/arm/boot/dts/qcom/sdm630-cdp.dtsi
Simple merge
diff --cc arch/arm/boot/dts/qcom/sdm630-qrd.dtsi
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Sat, 4 Mar 2017 01:39:18 +0000 (17:39 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Sat, 4 Mar 2017 01:39:17 +0000 (17:39 -0800)
		1	2
arch/arm/boot/dts/qcom/sdm630-cdp.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/qcom/sdm630-qrd.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history