Update baterry driver

(Resolved)Conflicts:
	arch/arm/mach-msm/htc_battery_8x60.c