Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:Alucard24/initramfs3
Cortex: reduced time to wait for sleep function.
Added Descriptions about two new settings of Nightmare Governor. Modified Profiles and cortex!
Ported CM10.1 INIT from RootBox 3.7 default kernel
i hope to fix WiFi HotSpot
Cortex: Added more HIGH pressure tuning for wakeup booster!
Tuned trans_latency for awake and sleep for all profiles.
used by Nightmare Gov only.
Merge branch 'master' of github.com:Alucard24/initramfs3
Merge remote-tracking branch 'upstream/master'

Conflicts:
	res/customconfig/battery.profile
	res/customconfig/customconfig.xml
	res/customconfig/default.profile
	res/customconfig/extreme_battery.profile
	res/customconfig/extreme_performance.profile
	res/customconfig/performance.profile