From: Zhang Rui <rui.zhang@intel.com>
Date: Fri, 17 Oct 2014 06:30:58 +0000 (+0800)
Subject: Merge branch 'int340x-thermal' of .git into next
X-Git-Tag: v3.18-rc2~11^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6ceaf58abe25e86292152005c51169796bad3407;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'int340x-thermal' of .git into next
---

6ceaf58abe25e86292152005c51169796bad3407