tree 5f0bb0439362d38c9bedf67869fae9fbb202ede7
parent d0b45880b2981e4b0edf1ce873114bf4e57061d5
parent 4cba7d23633c8ecb55460f0c614c3d57af0d8c08
parent 032f4a1e5a307c63b5ac27298ea82eb328f40ccc
author Zhang Rui <rui.zhang@intel.com> 1457999646 +0800
committer Zhang Rui <rui.zhang@intel.com> 1457999646 +0800

Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next