summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-27 00:43:24 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-27 00:43:24 +0100
commitbfde19c4c2467cbcb5c11ec0fdaa771b8c16cbce (patch)
treed94273a4948b8409e60c9a66d34eb3c5d420d219 /drivers/acpi
parentMerge branches 'pm-cpufreq' and 'pm-sleep' containing PM fixes (diff)
parentpowercap / RAPL: add support for ValleyView Soc (diff)
parentACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs (diff)
downloadlinux-bfde19c4c2467cbcb5c11ec0fdaa771b8c16cbce.tar.xz
linux-bfde19c4c2467cbcb5c11ec0fdaa771b8c16cbce.zip
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