Merge branch 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Sat, 6 May 2017 11:31:19 +0000 (19:31 +0800)
committerZhang Rui <rui.zhang@intel.com>
Sat, 6 May 2017 11:31:19 +0000 (19:31 +0800)
commitcb15c81a0c1c1f7829b9809a209ecacc77f5aa63
tree165f3a46c4d72ba5b1f517276f2026bec69a2d9b
parentbb4d5e38decf3f3c6bf170d19603949abb4d4b99
parente4cb5bb286af409d814e4d13c650a736769b854b
Merge branch 'thermal-soc' into next
drivers/thermal/Kconfig