tree f1e8c9c9a35c0af1a566e2e673c31abc04b1a35e
parent e26081808edadfd257c6c9d81014e3b25e9a6118
parent efa86858e1d8970411a140fa1e0c4dd18a8f2a89
author Zhang Rui <rui.zhang@intel.com> 1431994347 +0800
committer Zhang Rui <rui.zhang@intel.com> 1431994347 +0800

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