tree 5738d602cdc11f5750dae117ff6f8335661be0f7
parent 1f6b0889d0ea03541be03ccfc8d07deadae98283
parent 0744f1306f6b0ffc2c6bd68c1edf688b74fa8779
parent b474303ffd57e0a379ce73ca10232350f866f77b
parent cbd0f00017790caae0107d48ba76b4b768c9448b
author Zhang Rui <rui.zhang@intel.com> 1474956199 +0800
committer Zhang Rui <rui.zhang@intel.com> 1474956199 +0800

Merge branches 'thermal-soc', 'thermal-core', 'thermal-intel' and 'thermal-tegra-hw-throttle' into next