From: Zhang Rui <rui.zhang@intel.com>
Date: Tue, 9 Dec 2014 03:38:34 +0000 (+0800)
Subject: Merge branch 'eduardo-soc-thermal' into thermal-soc
X-Git-Tag: firefly_0821_release~176^2~2645^2^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c89d99546dc5b076ccd6692c48ada9a92820a4ac;p=firefly-linux-kernel-4.4.55.git

Merge branch 'eduardo-soc-thermal' into thermal-soc
---

c89d99546dc5b076ccd6692c48ada9a92820a4ac