diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 01:41:20 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 01:41:20 +0100 |
commit | 05d658b5b57214944067fb4f62bce59200bf496f (patch) | |
tree | f2aa2537874ab5c4e37e6e7073e857150e9e1f08 /drivers/misc/mei/pci-txe.c | |
parent | 794c33555f704047e4014d4601b3972cfbfe7e50 (diff) | |
parent | 2dd9789c76ffde05d5f4c56f45c3cb71b3936694 (diff) | |
download | linux-05d658b5b57214944067fb4f62bce59200bf496f.tar.bz2 |
Merge branch 'pm-sleep'
* pm-sleep:
freezer: Fix typo in freezable_schedule_timeout() comment
PM / s2idle: Clear the events_check_enabled flag
PM / sleep: Remove pm_complete_with_resume_check()
PM: ARM: locomo: Drop suspend and resume bus type callbacks
PM: Use a more common logging style
PM: Document rules on using pm_runtime_resume() in system suspend callbacks
Diffstat (limited to 'drivers/misc/mei/pci-txe.c')
0 files changed, 0 insertions, 0 deletions