diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-10 16:09:34 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-10 16:09:34 +0100 |
| commit | 740b68ea3ab7a55907e06b8b5b9a67082e345932 (patch) | |
| tree | 1a9adf25957a40e79ffcde869d7b6876c76e8c80 /kernel | |
| parent | 2f8c42f31c9352c9ab9e70616342d585d3c2b735 (diff) | |
| parent | f90b8ad83a6ae984edb6b489ed02e45dadfd263e (diff) | |
| parent | 04bf1c7f76b05be8134a833ec023f1c96f81b8a1 (diff) | |
| parent | 9835e58ab2bbc04dfe10e078288e88a48b5dbd46 (diff) | |
| download | linux-740b68ea3ab7a55907e06b8b5b9a67082e345932.tar.bz2 | |
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