summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2016-09-27 06:03:19 (GMT)
committerZhang Rui <rui.zhang@intel.com>2016-09-27 06:03:19 (GMT)
commit040a3eadf00b4993fb215fba1d788c91712401ba (patch)
tree5738d602cdc11f5750dae117ff6f8335661be0f7
parent1f6b0889d0ea03541be03ccfc8d07deadae98283 (diff)
parent0744f1306f6b0ffc2c6bd68c1edf688b74fa8779 (diff)
parentb474303ffd57e0a379ce73ca10232350f866f77b (diff)
parentcbd0f00017790caae0107d48ba76b4b768c9448b (diff)
downloadlinux-040a3eadf00b4993fb215fba1d788c91712401ba.tar.xz
Merge branches 'thermal-soc', 'thermal-core', 'thermal-intel' and 'thermal-tegra-hw-throttle' into next