cleanup of cherry-pick

Signed-off-by: Cerebro <zarboz@gmail.com>
msm_thermal: patch to upstream

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Signed-off-by: Zarboz <zarboz@gmail.com>

Conflicts:
	arch/arm/mach-msm/board-m7.c
finsihing pick:

Signed-off-by: Bryan Smith <zarboz@gmail.com>
thermal: update upstream msm_thermal with 3-phase control

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Signed-off-by: Cerebro <zarboz@gmail.com>