3.4.87

Change-Id: I75777ee950b29b63fe87af89730b400612ca04c1

Conflicts:
	drivers/hwmon/coretemp.c