tree 1a9adf25957a40e79ffcde869d7b6876c76e8c80
parent 2f8c42f31c9352c9ab9e70616342d585d3c2b735
parent f90b8ad83a6ae984edb6b489ed02e45dadfd263e
parent 04bf1c7f76b05be8134a833ec023f1c96f81b8a1
parent 9835e58ab2bbc04dfe10e078288e88a48b5dbd46
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1423580974 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1423580974 +0100

Merge branches 'pm-qos', 'pm-opp' and 'pm-devfreq'

* pm-qos:
  PM / QoS: Use lockdep asserts to find missing hold of power.lock
  PM / QoS: Add debugfs support to view the list of constraints

* pm-opp:
  PM / OPP: Assert RCU lock in exported functions
  PM / OPP: Update kernel documentation
  PM / OPP: Ensure consistent naming of static functions
  PM / OPP: export dev_pm_opp_get_notifier

* pm-devfreq:
  PM / devfreq: event: Add documentation for exynos-ppmu devfreq-event driver
  devfreq: Fix build break of devfreq-event class
  PM / devfreq: event: Add devfreq_event class
  PM / devfreq: tegra: add devfreq driver for Tegra Activity Monitor