undervolting and user undervolting
underclock and overclock

Conflicts:

	arch/arm/mach-msm/acpuclock-8960.c