Merge branches 'thermal-core' and 'thermal-intel' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Wed, 2 Sep 2015 02:08:02 +0000 (10:08 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 2 Sep 2015 02:08:02 +0000 (10:08 +0800)
commit5a924a07f882e866f2337bf65048be357956691a
tree9044da89d0057e67ddd968fbf57f848e6b591bc9
parent64291f7db5bd8150a74ad2036f1037e6a0428df2
parent934c93b8c193b62fc86256ea64aef65e9a7b4e9e
parentd0a12625d2ff2c63321b3cf48c48184748ab577a
Merge branches 'thermal-core' and 'thermal-intel' of .git into next
drivers/thermal/hisi_thermal.c
drivers/thermal/power_allocator.c
drivers/thermal/samsung/exynos_tmu.c
drivers/thermal/thermal_core.c