Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:Alucard24/initramfs3

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