3.4.85 and .86

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
Linux 3.4.87

Signed-off-by: LaboDJ <jacopolabardi@gmail.com>
Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>

Conflicts:
	drivers/hwmon/coretemp.c