diff options
| author | Rafael J. Wysocki | 2014-06-03 23:13:00 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2014-06-03 23:13:00 +0200 |
| commit | cd0c5bd391c45ace8527c105b79017149e695f85 (patch) | |
| tree | 7f187fc2f57a280d14571e52382fd46af60b2ddd /kernel | |
| parent | e81a0e771c10de86fdb52c6baf534ff5fdeec72c (diff) | |
| parent | 187369616ff98aa12772b7df28b74ade61ba39e6 (diff) | |
| parent | a97ac35b5d9e948ccfcbc04c69e9d2c94e788e94 (diff) | |
| parent | 4ec6a9cc23cbadb4721eb3fe778389c4bbede893 (diff) | |
| parent | 64ce854578de82e9e16280298562721ced971668 (diff) | |
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