From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 17 Jun 2013 23:26:49 +0000 (+0800)
Subject: Merge branch 'cpu-package-thermal' of .git into next
X-Git-Tag: v3.11-rc1~27^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9d1968fdabc69981ea98ea82082de1cc12a60385;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'cpu-package-thermal' of .git into next
---

9d1968fdabc69981ea98ea82082de1cc12a60385