diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-01 15:54:20 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-01 15:54:20 +0200 |
| commit | 56963d99b72ac52bb3185be7fe9832c1715c655a (patch) | |
| tree | 59767cfc64954cd6065ad617edb8011507338ad0 /kernel | |
| parent | 5cf896b3c7842036ba37cc7057d74d5a2af159a7 (diff) | |
| parent | 2fd77fff4b440c29b48c31db0ce2aec7d319959f (diff) | |
| parent | 8bb6944e5aabaf9b7977502667a6981733564f85 (diff) | |
| parent | 3fc147e9156f6c176e5543c59d31182252f14933 (diff) | |
| download | linux-56963d99b72ac52bb3185be7fe9832c1715c655a.tar.bz2 | |
Merge branches 'pm-sleep', 'pm-domains' and 'pm-avs'
* pm-sleep:
PM / suspend: make sync() on suspend-to-RAM build-time optional
PM / sleep: Allow devices without runtime PM to do direct-complete
PM / autosleep: Use workqueue for user space wakeup sources garbage collector
* pm-domains:
PM / Domains: Fix typo in description of genpd_dev_pm_detach()
PM / Domains: Remove unusable governor dummies
PM / Domains: Make pm_genpd_init() available to modules
PM / domains: Align column headers and data in pm_genpd_summary output
PM / Domains: Return -EPROBE_DEFER if we fail to init or turn-on domain
PM / Domains: Correct unit address in power-controller example
PM / Domains: Remove intermediate states from the power off sequence
* pm-avs:
PM / AVS: rockchip-io: add io selectors and supplies for rk3368
PM / AVS: rockchip-io: depend on CONFIG_POWER_AVS