Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:13:00 +0000 (23:13 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:13:00 +0000 (23:13 +0200)
commitcd0c5bd391c45ace8527c105b79017149e695f85
tree7f187fc2f57a280d14571e52382fd46af60b2ddd
parente81a0e771c10de86fdb52c6baf534ff5fdeec72c
parent187369616ff98aa12772b7df28b74ade61ba39e6
parenta97ac35b5d9e948ccfcbc04c69e9d2c94e788e94
parent4ec6a9cc23cbadb4721eb3fe778389c4bbede893
parent64ce854578de82e9e16280298562721ced971668
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
Documentation/power/runtime_pm.txt
MAINTAINERS