]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 00:11:28 +0000 (11:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 00:11:32 +0000 (11:11 +1100)
commit0cf7391fb7e0f1731b883841a343d959c72fa05e
tree09ba630abec51eb990e82cbd04283ad484c258da
parente7183095d54f57f66d0844bf0d6f8c2c1d8ec4db
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