Merge branch 'thermal' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:00:44 +0000 (05:00 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:00:44 +0000 (05:00 -0500)

Trivial merge