]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion...
authorZhang Rui <rui.zhang@intel.com>
Wed, 22 Feb 2017 07:35:06 +0000 (15:35 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 22 Feb 2017 07:35:06 +0000 (15:35 +0800)
commit6fefe19f583625ca4ea3ecc9128baa51c31c60a4
tree48bbd4773378bc285f30edb813de8899cde0d245
parentd9cc34a6e1a8e7d26d243c54fa6cef93556d44f2
parentee73bcdb0b1aab35654912d10f07da0176848a87
parentda8c1c46f2082ce4a094812806d7eab3c17a4817
parent2f96c035fbd143695eec5b465c98bcc52732626e
Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion' into next
drivers/thermal/cpu_cooling.c
drivers/thermal/thermal_core.c