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)
commitdd634666793e51b43b703161302310326c259d50
tree2da0cbb2db8176c4d5f7ef160f681ff6ed696aa1
parent62ebb7b16699996a8f8ad277ce6a36ef3c9114a3
parente4dbf98f7f169346f57296e173e883b7330076ab
Merge branches 'eduardo-soc' and 'bang-bang-governor' of .git into next
drivers/thermal/thermal_core.c