Fix for Custom Voltage

Conflicts:
	arch/arm/mach-omap2/omap2plus-cpufreq.c
Clean up