]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3e0c434f06e19156e00ee2f75dd0c165b4b63cde
tree7f187fc2f57a280d14571e52382fd46af60b2ddd
parent06db8e0405a723b6bddba47c892e9c9b30413898
parent9e3a0e833c42e3ad42741efb1805c4060cfdb56c
parent3aaa7a2e8ab14c417d6c302c508df64369be7aa8
parent521e57e119a44f0df302c563a34d6204bd6a66bc
parentcae20c44b6ad961e567260af4b7e11f4352cdfe1
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