diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2017-07-05 15:01:06 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2017-07-05 15:01:06 +0800 |
| commit | 5d72ed35678a351a1aed4b454c25d583f8bccb28 (patch) | |
| tree | a0c034bb295e3e78304533d4dffb0a2d5022c974 | |
| parent | 0d76d6e1eede5f2aa13695cb4c9d763bb3555e3e (diff) | |
| parent | 4ca0e75e46b6ee408bdc334fff449323d476812c (diff) | |
| parent | 467aebee872af7f5e703809e19a66de633a1aa2c (diff) | |
| download | linux-5d72ed35678a351a1aed4b454c25d583f8bccb28.tar.bz2 | |
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next