CPUFREQ: Fixed all errors and dependencies for governors and merged

This reverts commit 7e0f70e6304a15249e64bd4d1fb5da7f5fdef83f.
blahh
Revert "blahh"

This reverts commit 3e87a2c3eedd4f8af550215a8752997de6a52902.
Revert "CPUFREQ: Fixed all errors and dependencies for governors and merged"

This reverts commit 3347e15054d0959b118ca47164b7824d87beee49.