Ondemandx to defconfig
re added zenx
enabled ZENX
Merge branch 'reborn-testing' into governors

Conflicts:
	arch/arm/configs/cyanogenmod_hercules_defconfig