summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-02-20 14:26:02 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-02-20 14:26:02 +0100
commit58339feae7133f1be6228b7ab56a147712aa0a92 (patch)
treea171323b107f070504baf1b4a1ff40308cc1da36 /drivers/base
parent41ef3d1df037a429703db503e98fa948ee34b895 (diff)
parent09bb6e93956ae5175b96905b723ec879c3ca0765 (diff)
parente84b4a84e52d4cd8770b4242cd09df0133333f63 (diff)
parent16d0bf1882109da84b4b90d7ba4fc7ba18db0d67 (diff)
downloadlinux-58339feae7133f1be6228b7ab56a147712aa0a92.tar.bz2
Merge branches 'pm-core', 'pm-qos' and 'pm-domains'
* pm-core: PM / wakeirq: report a wakeup_event on dedicated wekup irq PM / wakeirq: Fix spurious wake-up events for dedicated wakeirqs PM / wakeirq: Enable dedicated wakeirq for suspend * pm-qos: PM / QoS: Fix memory leak on resume_latency.notifiers PM / QoS: Remove unneeded linux/miscdevice.h include * pm-domains: PM / Domains: Provide dummy governors if CONFIG_PM_GENERIC_DOMAINS=n PM / Domains: Fix asynchronous execution of *noirq() callbacks PM / Domains: Correct comment in irq_safe_dev_in_no_sleep_domain() PM / Domains: Rename functions in genpd for power on/off