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)
1  2 
drivers/thermal/Kconfig

Simple merge