Linux 3.0.69

Conflicts:
	drivers/hwmon/sht15.c