Merge "power_supply: add DIE_HEALTH and CONNECTOR_HEALTH properties"

author Linux Build Service Account <lnxbuild@localhost>

Fri, 10 Feb 2017 14:46:01 +0000 (06:46 -0800)

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

Fri, 10 Feb 2017 14:46:01 +0000 (06:46 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Fri, 10 Feb 2017 14:46:01 +0000 (06:46 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Fri, 10 Feb 2017 14:46:01 +0000 (06:46 -0800)
diff --cc drivers/power/supply/qcom/qpnp-smb2.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Fri, 10 Feb 2017 14:46:01 +0000 (06:46 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Fri, 10 Feb 2017 14:46:01 +0000 (06:46 -0800)