tree da4af079dbf6f10e080150ccc5539fc10dfbf278
parent d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c
parent 992edf395b8a8411c506f4345bc04451eba95976
author Zhang Rui <rui.zhang@intel.com> 1487663423 +0800
committer Zhang Rui <rui.zhang@intel.com> 1487663423 +0800

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