]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 01:44:33 +0000 (11:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 01:44:33 +0000 (11:44 +1000)
1  2 
drivers/acpi/thermal.c
drivers/hwmon/Kconfig
drivers/hwmon/Makefile

Simple merge
Simple merge
Simple merge