cpufreq: lulzactive governor
Merge branch 'jbdev' into jellybean

Conflicts:
	include/linux/cpufreq.h