tree 55b7f7e601dbfb7215f16ff3cfe0496b2d47e345
parent dea4f48a0a301b23c65af8e4fe8ccf360c272fbf
parent 1beabfbea3a8648575afe04f6f3ddf107c240fb0
author Zhang Rui <rui.zhang@intel.com> 1388626776 +0800
committer Zhang Rui <rui.zhang@intel.com> 1388626776 +0800

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