kernel/return_address.c: hide warning

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
drivers/thermal: Add 3-phase in kernel thermal management

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

Conflicts:
	arch/arm/mach-msm/htc/ville/board-ville.c
	drivers/thermal/msm_thermal.c
	include/linux/msm_thermal.h

Conflicts:
	drivers/thermal/msm_thermal.c
	include/linux/msm_thermal.h
Revert "drivers/thermal: Add 3-phase in kernel thermal management"

This reverts commit e67d8cdc642ae9a198fcbb355cdce82316be3127.