This reverts commit 55ca1d277a.
Conflicts:
arch/arm/configs/htcleo_defconfig
arch/arm/mach-msm/board-htcleo.c
arch/arm/mach-msm/htc_battery.c
include/linux/ds2746_battery.h
This reverts commit 55ca1d277a.
Conflicts:
arch/arm/configs/htcleo_defconfig
arch/arm/mach-msm/board-htcleo.c
arch/arm/mach-msm/htc_battery.c
include/linux/ds2746_battery.h