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 2015-11-03 15:24:40 +08:00
commit c75960aa7a
15 changed files with 985 additions and 35 deletions