Merge "qpnp-fg-gen3: use IMA single mode for pm660 fuel gauge"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 29 Mar 2017 21:30:44 +0000 (14:30 -0700)

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

Wed, 29 Mar 2017 21:30:44 +0000 (14:30 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 29 Mar 2017 21:30:44 +0000 (14:30 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 29 Mar 2017 21:30:44 +0000 (14:30 -0700)
diff --cc drivers/power/supply/qcom/fg-memif.c
Simple merge
diff --cc drivers/power/supply/qcom/qpnp-fg-gen3.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 29 Mar 2017 21:30:44 +0000 (14:30 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 29 Mar 2017 21:30:44 +0000 (14:30 -0700)
		1	2
drivers/power/supply/qcom/fg-memif.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/power/supply/qcom/qpnp-fg-gen3.c	patch \|	diff1 \|	diff2 \|	blob \| history