Merge branches 'thermal-core-fix', 'thermal-soc' and 'thermal-int340x' into next
authorZhang Rui <rui.zhang@intel.com>
Sat, 13 Dec 2014 04:25:19 +0000 (12:25 +0800)
committerZhang Rui <rui.zhang@intel.com>
Sat, 13 Dec 2014 04:25:19 +0000 (12:25 +0800)
commit2707dbd09a859b7205917f9baf9d0192944ac46c
tree867352adee19affe11530c953dea3d89b27cad2a
parentaf6c9f1657ca6d2ef2b2c0e31ad17c6fbf773baf
parentc89d99546dc5b076ccd6692c48ada9a92820a4ac
parente413ad7cca9f541659ac0ddf8f37e2bcfade365a
Merge branches 'thermal-core-fix', 'thermal-soc' and 'thermal-int340x' into next
include/linux/thermal.h