Cleaning nightmare gov.
Merge remote-tracking branch 'upstream/master-jelly-cm-aokp' into master-jelly-cm-aokp

Conflicts:
	drivers/cpufreq/cpufreq_nightmare.c