Merge "power: smb-lib: Rerun APSD regardless of charger-type"

author Linux Build Service Account <lnxbuild@localhost>

Sat, 1 Apr 2017 04:24:25 +0000 (21:24 -0700)

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

Sat, 1 Apr 2017 04:24:24 +0000 (21:24 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Sat, 1 Apr 2017 04:24:25 +0000 (21:24 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Sat, 1 Apr 2017 04:24:24 +0000 (21:24 -0700)
diff --cc drivers/power/supply/qcom/smb-lib.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Sat, 1 Apr 2017 04:24:25 +0000 (21:24 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Sat, 1 Apr 2017 04:24:24 +0000 (21:24 -0700)