summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-10-02 14:17:09 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-10-02 14:17:09 +0200
commit799f6ecd867854815094539f2fbd051527c7a5dc (patch)
tree9ba0a3b69bc3b771e2cedafa3764c8c649223fcf
parent1a3c4aecb4266b4eb5594163bb0bf38ac488668d (diff)
parenta380f2edef65b2447a043251bb3c00a9d2153a8b (diff)
parent1cb31d3fd4d96b19624328da0a0496adf76f98a6 (diff)
parent104dc5e20ff52748a16f756ae946391bdc6a4d0a (diff)
downloadlinux-799f6ecd867854815094539f2fbd051527c7a5dc.tar.gz
Merge branches 'pm-core', 'pm-pci' and 'pm-sleep-next' into linux-next
* pm-core: PM / core: Drop legacy class suspend/resume operations * pm-pci: PCI / PM: Do not resume any devices in pci_pm_prepare() * pm-sleep-next: PM: Document rules on using pm_runtime_resume() in system suspend callbacks