tree d94273a4948b8409e60c9a66d34eb3c5d420d219
parent 1a6725359ec20e8505312fbf7ed9592ef830b767
parent ed93b71492da3464b4798613aa8a99bed914251b
parent f6308b36c411dc5afd6a6f73e6454722bfde57b7
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1388101404 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1388101404 +0100

Merge branches 'powercap' and 'acpi-lpss' with new device IDs

* powercap:
  powercap / RAPL: add support for ValleyView Soc

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