tree f2bae724550db82264c525d9edfdec8705327817
parent 049e6dde7e57f0054fdc49102e7ef4830c698b46
parent 8fb2b9ac2aadd6d87f89071c2c85f8c12b41c943
author Zhang Rui <rui.zhang@intel.com> 1446535480 +0800
committer Zhang Rui <rui.zhang@intel.com> 1446535480 +0800

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc