governor changes

Conflicts:
	arch/arm/configs/fighter_defconfig