Merge back earlier ACPI thermal material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 29 May 2014 11:28:14 +0000 (13:28 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 29 May 2014 11:28:14 +0000 (13:28 +0200)

Trivial merge