Merge "qcom: smb2: ensure QC adapter is at 5V at shutdown"

author Linux Build Service Account <lnxbuild@localhost>

Sun, 16 Apr 2017 06:11:11 +0000 (23:11 -0700)

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

Sun, 16 Apr 2017 06:11:11 +0000 (23:11 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Sun, 16 Apr 2017 06:11:11 +0000 (23:11 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Sun, 16 Apr 2017 06:11:11 +0000 (23:11 -0700)
diff --cc drivers/power/supply/qcom/qpnp-smb2.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Sun, 16 Apr 2017 06:11:11 +0000 (23:11 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Sun, 16 Apr 2017 06:11:11 +0000 (23:11 -0700)