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 2017-02-21 15:50:23 +08:00
commit ef1d75263f
13 changed files with 797 additions and 57 deletions