Merge "power: pm8921-bms: fix SOC jumps while entering suspend/resume"
Signed-off-by: task650 <task650@gmail.com>

Conflicts:
	drivers/power/pm8921-bms.c