Post pull request intellithermal fixup for Ville
Merge remote-tracking branch 'aktoronto/kk-devel5' into kk-dev6

Conflicts:
	arch/arm/configs/ville_defconfig