diff options
| author |   Zhang Rui <rui.zhang@intel.com> | 2016-03-15 07:54:06 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2016-03-15 07:54:06 +0800 |
| commit | b82ddd48e8bc01cd7bfc8511dc31778c5c4ebe6e (patch) | |
| tree | 5f0bb0439362d38c9bedf67869fae9fbb202ede7 /drivers/thermal | |
| parent | thermal: trace: migrating thermal traces to use TRACE_DEFINE_ENUM() macros (diff) | |
| parent | thermal: intel_pch_thermal: Enable Skylake PCH thermal (diff) | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc (diff) | |
| download | linux-dev-b82ddd48e8bc01cd7bfc8511dc31778c5c4ebe6e.tar.xz linux-dev-b82ddd48e8bc01cd7bfc8511dc31778c5c4ebe6e.zip | |
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next