m8: upstream to latest bacon cpufreq and mako hotplug

Conflicts:
	arch/arm/kernel/mako_hotplug.c
	drivers/cpufreq/cpufreq.c
DERP