Revert "Revert "GPU oc""

This reverts commit ef6638135659e89d62672f961fcfcc59b5527cd6.
Revert "Revert "GPU OC:bring in additional frequency steps, set default to stock speeds.""

This reverts commit c9f4e57a756fdc29902a693bf0334bb02de89d52.
Revert "Revert "GPU OC: clean up""

This reverts commit 43ccc7a1d6df2427c3fae98f040c93631354b10c.
Revert "Revert "GPU OC: more clean up work""

This reverts commit caed41e12cef84c389b1a730f739aec1a61ec7cd.
Revert "Revert "GPU OC: add ifdef for gpu clock init levels. This fixes gpu fail when CONFIG_GPU_OVERCLOCK is not set""

This reverts commit a5d2125fd3d88ac1112e4e4e5830e6bca025eb59.
HTC_battery_8960.c : Fixup fast charge

Conflicts:
	arch/arm/mach-msm/htc/htc_battery_8960.c

Conflicts:
	arch/arm/mach-msm/htc/htc_battery_8960.c