tree 9044da89d0057e67ddd968fbf57f848e6b591bc9
parent 64291f7db5bd8150a74ad2036f1037e6a0428df2
parent 934c93b8c193b62fc86256ea64aef65e9a7b4e9e
parent d0a12625d2ff2c63321b3cf48c48184748ab577a
author Zhang Rui <rui.zhang@intel.com> 1441159682 +0800
committer Zhang Rui <rui.zhang@intel.com> 1441159682 +0800

Merge branches 'thermal-core' and 'thermal-intel' of .git into next