diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:13:00 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:13:00 +0200 |
| commit | cd0c5bd391c45ace8527c105b79017149e695f85 (patch) | |
| tree | 7f187fc2f57a280d14571e52382fd46af60b2ddd | |
| parent | Merge branch 'acpi-thermal' (diff) | |
| parent | MAINTAINERS: Remove Bjorn Helgaas as PNP maintainer (diff) | |
| parent | powercap / RAPL: add new CPU IDs (diff) | |
| parent | PM / runtime: Update documentation to reflect the current code flow (diff) | |
| parent | PM / OPP: discard duplicate OPPs (diff) | |
| download | linux-cd0c5bd391c45ace8527c105b79017149e695f85.tar.xz linux-cd0c5bd391c45ace8527c105b79017149e695f85.zip | |
Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp'
* pnp:
MAINTAINERS: Remove Bjorn Helgaas as PNP maintainer
PNP / resources: remove positive test on unsigned values
* powercap:
powercap / RAPL: add new CPU IDs
powercap / RAPL: further relax energy counter checks
* pm-runtime:
PM / runtime: Update documentation to reflect the current code flow
* pm-opp:
PM / OPP: discard duplicate OPPs
PM / OPP: Make OPP invisible to users in Kconfig
PM / OPP: fix incorrect OPP count handling in of_init_opp_table