diff options
author | Zhang Rui <rui.zhang@intel.com> | 2014-05-15 11:18:02 +0200 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2014-05-15 11:18:02 +0200 |
commit | 63745aa72ed16154b82a0c9ed22a88001d6ea0fa (patch) | |
tree | 153d8f5f80bdcd574632e846138a8751e1ee7b78 /drivers/thermal/Kconfig | |
parent | thermal: armada: Support Armada 380 SoC (diff) | |
parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti... (diff) | |
parent | thermal: Intel SoC DTS thermal (diff) | |
parent | thermal: spear: remove unnecessary OOM messages (diff) | |
download | linux-63745aa72ed16154b82a0c9ed22a88001d6ea0fa.tar.xz linux-63745aa72ed16154b82a0c9ed22a88001d6ea0fa.zip |
Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel-soc-dts-thermal' and 'thermal-soc-fixes' of .git into next