Merge "ARM: dts: msm: configure interrupt types for charger for pmi8998"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 15 Feb 2017 14:11:40 +0000 (06:11 -0800)

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

Wed, 15 Feb 2017 14:11:40 +0000 (06:11 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 15 Feb 2017 14:11:40 +0000 (06:11 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 15 Feb 2017 14:11:40 +0000 (06:11 -0800)
diff --cc arch/arm/boot/dts/qcom/msm-pmi8998.dtsi
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 15 Feb 2017 14:11:40 +0000 (06:11 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 15 Feb 2017 14:11:40 +0000 (06:11 -0800)