summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2016-11-30 10:26:38 +0800
committerZhang Rui <rui.zhang@intel.com>2016-11-30 10:26:38 +0800
commit9245ac20d829dd3af164eb0e04d72d53939e88dd (patch)
treeefdcd5700c4232595badbd3d636d0f279dd4cce6 /drivers/thermal
parentf37fabb8643eaf8e3b613333a72f683770c85eca (diff)
parent7646ff2e7a33ef097c0e8d189c63a60764f757dc (diff)
parent3aa5374376746f20a27be8682be7f91c8b71d1d8 (diff)
parent373f91d1256db7d8f494fd473c05dbc961a37f23 (diff)
downloadlinux-9245ac20d829dd3af164eb0e04d72d53939e88dd.tar.bz2
Merge branches 'thermal-core', 'thermal-intel', 'thermal-soc-fixes' and 'thermal-reorg' into next