Merge "qcom-charger: smblib: lower delay in OTG soft-start check"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 10 Nov 2016 23:14:35 +0000 (15:14 -0800)

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

Thu, 10 Nov 2016 23:14:34 +0000 (15:14 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 10 Nov 2016 23:14:35 +0000 (15:14 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 10 Nov 2016 23:14:34 +0000 (15:14 -0800)
diff --cc drivers/power/qcom-charger/smb-lib.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 10 Nov 2016 23:14:35 +0000 (15:14 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 10 Nov 2016 23:14:34 +0000 (15:14 -0800)