]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branches 'thermal-core', 'thermal-soc' and 'thermal-int340x' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Wed, 24 Dec 2014 02:38:30 +0000 (10:38 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 24 Dec 2014 02:38:30 +0000 (10:38 +0800)
commit7429b1e0d00e62426c74a45195ba72149cb9ad64
treec22a487d2f051f147dd0ff234ac566e741ac3c6e
parentfc4de356e033a46a08caf78027df871cc20780c1
parent0733d1387ed8b845a6b60121f06ddbe9e24f12ea
parentf8061d383b09ed933a49ac3fd301c2f991261851
Merge branches 'thermal-core', 'thermal-soc' and 'thermal-int340x' of .git into next
drivers/thermal/cpu_cooling.c