Merge branches 'powercap' and 'acpi-lpss' with new device IDs
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Dec 2013 23:43:24 +0000 (00:43 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Dec 2013 23:43:24 +0000 (00:43 +0100)
* powercap:
  powercap / RAPL: add support for ValleyView Soc

* acpi-lpss:
  ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs


Trivial merge