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

This commit is contained in:
Zhang Rui 2018-01-13 14:47:13 +08:00
commit 90ce8dfafa
8 changed files with 297 additions and 186 deletions