Merge remote-tracking branch 'upstream/master-jelly-bean' into master-jelly-bean
Some Nightmare Governor Adjustments :)
Merge remote-tracking branch 'upstream/master-jelly-bean' into master-jelly-bean
Merge branch 'master-jelly-bean' of github.com:Alucard24/Dorimanx-SG2-I9100-Kernel into master-jelly-bean

Conflicts:
	drivers/cpufreq/cpufreq_nightmare.c