OSDN Git Service

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Thu, 11 Jun 2015 02:55:42 +0000 (10:55 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 11 Jun 2015 02:55:42 +0000 (10:55 +0800)
commit53daf9383f34d7bf61358a37449fb4d59fbdafc2
treefc48ebe4fbf8e6c48cc07fcdab82a6010f7c61cf
parente26081808edadfd257c6c9d81014e3b25e9a6118
parent9a5238a9c6c33dd31525f2bba4aa1af4f8374ae1
Merge branch 'linus' of git://git./linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
drivers/thermal/thermal_core.h