Intelli HotPlug + Thermal Control fixes!

intelli Hotplug can be selected via STweaks only.
or till faux will add nw path to his app!

/sys/kernel/intelli_plug/intelli_plug_active

-rw-rw-r--    1 root     root          4096 Mar 27 13:58 busy_persistence
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 busy_sampling_ms
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 cpu_down_factor
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 debug_intelli_plug
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 def_sampling_ms
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 dual_core_persistence
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 eco_mode_active
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 intelli_plug_active
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 nr_fshift
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 nr_run_hysteresis
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 quad_core_persistence
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 strict_mode_active
-rw-rw-r--    1 root     root          4096 Mar 27 13:58 tri_core_persistence

Conflicts:
	drivers/thermal/intelli/msm_thermal.c

Change-Id: I9b0f6f8e3ccc117c55cd6b7cdfdd3bca0e95dfc8