OSDN Git Service

Merge branches 'fixes' and 'thermal-intel' into next
authorZhang Rui <rui.zhang@intel.com>
Mon, 18 Mar 2019 14:37:44 +0000 (22:37 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 18 Mar 2019 14:37:44 +0000 (22:37 +0800)
commit2d7c4e17811f766321b9c054609551fa40f0b445
tree8ff9a27b5771a4a618192ee7f3aba4fee5db8213
parentfb4d83f293e072ad96848959d20664e2a9f2235b
parente925b5be5751f6a7286bbd9a4cbbc4ac90cc5fa6
Merge branches 'fixes' and 'thermal-intel' into next
drivers/thermal/intel/intel_powerclamp.c