]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:48:45 +0000 (10:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:57:51 +0000 (10:57 +1100)
commit6fdee86d13457fa7dc7578aea7151d3c2397efd6
treef29592fb892159a2deb855d56ec085665b30e030
parent8f055c6557229ae792faa50885a5adb14ad175c0
parent4b69a04bf43a1759bee132d1acdde9b7b5f26381
Merge remote-tracking branch 'thermal/next'

Conflicts:
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/thermal/thermal_sys.c
drivers/acpi/thermal.c
drivers/hwmon/Kconfig
drivers/hwmon/Makefile
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/thermal/cpu_cooling.c
drivers/thermal/thermal_sys.c