Merge remote-tracking branch 'thermal/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 14 Sep 2012 00:36:15 +0000 (10:36 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 14 Sep 2012 00:36:15 +0000 (10:36 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Sep 2012 00:36:15 +0000 (10:36 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Sep 2012 00:36:15 +0000 (10:36 +1000)
diff --cc drivers/acpi/thermal.c
Simple merge
diff --cc drivers/hwmon/Kconfig
Simple merge
diff --cc drivers/hwmon/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Sep 2012 00:36:15 +0000 (10:36 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Sep 2012 00:36:15 +0000 (10:36 +1000)
		1	2
drivers/acpi/thermal.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history