From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 3 Jun 2014 21:13:00 +0000 (+0200)
Subject: Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp'
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cd0c5bd391c45ace8527c105b79017149e695f85;p=openwrt%2Fstaging%2Fblogic.git

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
---

cd0c5bd391c45ace8527c105b79017149e695f85