From: Zhang Rui <rui.zhang@intel.com>
Date: Sat, 11 Oct 2014 01:28:13 +0000 (+0800)
Subject: Merge branch 'thermal-core-fix' of .git into next
X-Git-Tag: v3.18-rc2~11^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9ceaa81efd1dd5ec83cf6be5a9445809583a03b6;p=linux.git

Merge branch 'thermal-core-fix' of .git into next
---

9ceaa81efd1dd5ec83cf6be5a9445809583a03b6