]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 02:12:15 +0000 (12:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 02:12:15 +0000 (12:12 +1000)
commit0bb326e5ad7e5c8a79d43f8767af5c40f8104362
tree875e151c356f06cd1176a27c03df0c813b4c4048
parentb09cac54c34c2b8cb336298961523fd3ce5f2a82
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/thermal_sys.c