Merge branches 'thermal-soc', 'thermal-core', 'thermal-intel' and 'thermal-tegra...
authorZhang Rui <rui.zhang@intel.com>
Tue, 27 Sep 2016 06:03:19 +0000 (14:03 +0800)
committerZhang Rui <rui.zhang@intel.com>
Tue, 27 Sep 2016 06:03:19 +0000 (14:03 +0800)
commit040a3eadf00b4993fb215fba1d788c91712401ba
tree5738d602cdc11f5750dae117ff6f8335661be0f7
parent1f6b0889d0ea03541be03ccfc8d07deadae98283
parent0744f1306f6b0ffc2c6bd68c1edf688b74fa8779
parentb474303ffd57e0a379ce73ca10232350f866f77b
parentcbd0f00017790caae0107d48ba76b4b768c9448b
Merge branches 'thermal-soc', 'thermal-core', 'thermal-intel' and 'thermal-tegra-hw-throttle' into next
drivers/thermal/Kconfig
drivers/thermal/Makefile