OSDN Git Service

Merge branches 'release' and 'thermal-soc' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Thu, 11 Jun 2015 04:52:14 +0000 (12:52 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 11 Jun 2015 04:52:14 +0000 (12:52 +0800)
commit111b23cf895b5cbcdc1b2c6580be1bb78a577d05
tree89b840115ccd753216ba0b26e587e52699b99310
parent6a6bcf08e5d1834447655a762dfaf552b675cc54
parent53daf9383f34d7bf61358a37449fb4d59fbdafc2
Merge branches 'release' and 'thermal-soc' of .git into next
drivers/thermal/Kconfig
drivers/thermal/Makefile
drivers/thermal/intel_powerclamp.c