summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2017-02-22 10:35:06 +0300
committerZhang Rui <rui.zhang@intel.com>2017-02-22 10:35:06 +0300
commit6fefe19f583625ca4ea3ecc9128baa51c31c60a4 (patch)
tree48bbd4773378bc285f30edb813de8899cde0d245 /drivers
parentd9cc34a6e1a8e7d26d243c54fa6cef93556d44f2 (diff)
parentee73bcdb0b1aab35654912d10f07da0176848a87 (diff)
parentda8c1c46f2082ce4a094812806d7eab3c17a4817 (diff)
parent2f96c035fbd143695eec5b465c98bcc52732626e (diff)
downloadlinux-6fefe19f583625ca4ea3ecc9128baa51c31c60a4.tar.xz
Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion' into next