Merge branch 'thermal-core-fix' of .git into next
commit9ceaa81efd1dd5ec83cf6be5a9445809583a03b6
authorZhang Rui <rui.zhang@intel.com>
Sat, 11 Oct 2014 01:28:13 +0000 (11 09:28 +0800)
committerZhang Rui <rui.zhang@intel.com>
Sat, 11 Oct 2014 01:28:13 +0000 (11 09:28 +0800)
tree776b6c713918e2f9c3475570383e37b5a951b6a3
parentdd634666793e51b43b703161302310326c259d50
parent26bb0e9a1a938ec98ee07aa76533f1a711fba706
Merge branch 'thermal-core-fix' of .git into next
drivers/thermal/step_wise.c