Fix merge

This reverts the commit "Revert 'modified patch for cpu-freq.c by tpruvot for 2.6.32 to lower max
cpu speed and disable second core while screen is off'"

Change-Id: I3c95d9eab70ac3415406b9dff8a1e2a8ecd6e4eb
Merge branch 'cm-10.2' into martincz