Solved the problem about charging to 99% (from Skywalker)

Conflicts:

	drivers/power/ariesve_battery.c