diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2016-09-27 14:03:19 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2016-09-27 14:03:19 +0800 |
| commit | 040a3eadf00b4993fb215fba1d788c91712401ba (patch) | |
| tree | 5738d602cdc11f5750dae117ff6f8335661be0f7 /Documentation/vDSO | |
| parent | 1f6b0889d0ea03541be03ccfc8d07deadae98283 (diff) | |
| parent | 0744f1306f6b0ffc2c6bd68c1edf688b74fa8779 (diff) | |
| parent | b474303ffd57e0a379ce73ca10232350f866f77b (diff) | |
| parent | cbd0f00017790caae0107d48ba76b4b768c9448b (diff) | |
| download | linux-040a3eadf00b4993fb215fba1d788c91712401ba.tar.gz linux-040a3eadf00b4993fb215fba1d788c91712401ba.tar.bz2 linux-040a3eadf00b4993fb215fba1d788c91712401ba.zip | |
Merge branches 'thermal-soc', 'thermal-core', 'thermal-intel' and 'thermal-tegra-hw-throttle' into next