OSDN Git Service

Merge branch 'pm-core'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Nov 2017 00:41:26 +0000 (01:41 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Nov 2017 00:41:26 +0000 (01:41 +0100)
commit1efef68262dc567f0c09da9d11924e8287cd3a8b
treeef4534f2683ea2e5bb6b1091d3b910f8d0181fbf
parent05d658b5b57214944067fb4f62bce59200bf496f
parent05087360fd7acf2cc9b7bbb243c12765c44c7693
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
Documentation/driver-api/pm/devices.rst
drivers/acpi/device_pm.c
drivers/base/power/runtime.c
drivers/misc/mei/pci-me.c
drivers/misc/mei/pci-txe.c
drivers/pci/pci-driver.c
include/linux/pci.h