tree ef4534f2683ea2e5bb6b1091d3b910f8d0181fbf
parent 05d658b5b57214944067fb4f62bce59200bf496f
parent 05087360fd7acf2cc9b7bbb243c12765c44c7693
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1510533686 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1510533686 +0100

Merge branch 'pm-core'

* pm-core:
  ACPI / PM: Take SMART_SUSPEND driver flag into account
  PCI / PM: Take SMART_SUSPEND driver flag into account
  PCI / PM: Drop unnecessary invocations of pcibios_pm_ops callbacks
  PM / core: Add SMART_SUSPEND driver flag
  PCI / PM: Use the NEVER_SKIP driver flag
  PM / core: Add NEVER_SKIP and SMART_PREPARE driver flags
  PM / core: Convert timers to use timer_setup()
  PM / core: Fix kerneldoc comments of four functions
  PM / core: Drop legacy class suspend/resume operations