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

This commit is contained in:
Zhang Rui 2014-05-15 16:41:34 +08:00
commit 9550b8d1dc
7 changed files with 355 additions and 41 deletions