Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Thu, 15 May 2014 08:41:34 +0000 (16:41 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 15 May 2014 08:41:34 +0000 (16:41 +0800)
commit9550b8d1dcfeceb4f6def1f0c56db4daee6bb4d7
tree8adf1b83b8e0b7efd6c080efbbb4c04f66957b17
parentd6d211db37e75de2ddc3a4f979038c40df7cc79c
parent923488a53e7890566f298c2f67416af84ba2a21c
Merge branch 'next' of git://git./linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc-fixes
drivers/thermal/Kconfig