| commit | efa2498bb8423ce1d06d45fbe8782f272350b7af | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Thu Jan 07 10:13:11 2016 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Thu Jan 07 10:16:07 2016 +0800 |
| tree | 469d8154ee1b678ec660716af15c752ce9761809 | |
| parent | e0494f8e1d7e526eefb9e474a4e796757ce974c7 [diff] | |
| parent | ad74e46cb3ba9e706f91f3f71baf816d2d8e45db [diff] | |
| parent | ab4a7a5cff7aacab4ca6417803a09c77ce2acad2 [diff] |
Merge branches 'thermal-core', 'thermal-soc' and 'thermal-intel' into next