MSM HOTPLUG: Small fixes for bail out, and last ifdef for suspend.
thermal-core: Fix invalid sensor request not accounted correctly

Add NULL check for sensor name before using it in sensor_get_id and
return NULL explicitly when sensor id is not valid in get_sensor of
thermal core.

Signed-off-by: Anji Jonnala <anjir@codeaurora.org>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
msm: hotplug: Try conservative load scale

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>

Conflicts:
	arch/arm/mach-msm/msm_hotplug.c
Revert "cpufreq: cpu-boost: Unify input and hotplug boost"

This reverts commit 799ecb0cf0780cd2007c8855837e9fe334435211.