Merge branches 'eduardo-soc' and 'bang-bang-governor' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Thu, 18 Sep 2014 06:48:40 +0000 (14:48 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 18 Sep 2014 06:48:40 +0000 (14:48 +0800)
1  2 
drivers/thermal/thermal_core.c

Simple merge