Merge "power: qpnp-fg-gen3: add support to configure batt_therm coefficients"

author Linux Build Service Account <lnxbuild@localhost>

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

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

Wed, 15 Feb 2017 14:11:09 +0000 (06:11 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 15 Feb 2017 14:11:09 +0000 (06:11 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 15 Feb 2017 14:11:09 +0000 (06:11 -0800)
diff --cc drivers/power/supply/qcom/qpnp-fg-gen3.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 15 Feb 2017 14:11:09 +0000 (06:11 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 15 Feb 2017 14:11:09 +0000 (06:11 -0800)