Merge "smb-lib: account for Jeita while distributing FCC"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 28 Jul 2016 02:26:39 +0000 (19:26 -0700)

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

Thu, 28 Jul 2016 02:26:39 +0000 (19:26 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 28 Jul 2016 02:26:39 +0000 (19:26 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 28 Jul 2016 02:26:39 +0000 (19:26 -0700)
diff --cc drivers/power/qcom-charger/smb-lib.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 28 Jul 2016 02:26:39 +0000 (19:26 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 28 Jul 2016 02:26:39 +0000 (19:26 -0700)