From: Len Brown <len.brown@intel.com>
Date: Wed, 23 Mar 2011 06:33:46 +0000 (-0400)
Subject: Merge branch 'bugfix-thermal' into release
X-Git-Tag: v2.6.39-rc1~90^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=797b10a07069e153d41aedb4ae8e76660279e2ee;p=linux.git

Merge branch 'bugfix-thermal' into release
---

797b10a07069e153d41aedb4ae8e76660279e2ee