Merge branch 'int340x-thermal' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 17 Oct 2014 06:30:58 +0000 (14:30 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 17 Oct 2014 06:30:58 +0000 (14:30 +0800)
1  2 
drivers/thermal/Kconfig
drivers/thermal/Makefile

Simple merge
Simple merge