tree 6c056f91ea3de0448d6e434e592aa128f28f56a6
parent 9b34ffa09d227131dd764657dd38ed43b22c5611
parent 74cd8171c42fcb0a0d55575dd036239b7325a455
parent a0504aecba76baa1cddbc23512eb8be14df74cef
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1528101620 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1528101620 +0200

Merge branches 'pm-qos' and 'pm-core'

* pm-qos:
  PM / QoS: Drop redundant declaration of pm_qos_get_value()

* pm-core:
  PM / runtime: Drop usage count for suppliers at device link removal
  PM / runtime: Fixup reference counting of device link suppliers at probe
  PM: wakeup: Use pr_debug() for the "aborting suspend" message
  PM / core: Drop unused internal inline functions for sysfs
  PM / core: Drop unused internal functions for pm_qos sysfs
  PM / core: Drop unused internal inline functions for wakeirqs
  PM / core: Drop internal unused inline functions for wakeups
  PM / wakeup: Only update last time for active wakeup sources
  PM / wakeup: Use seq_open() to show wakeup stats
  PM / core: Use dev_printk() and symbols in suspend/resume diagnostics
  PM / core: Simplify initcall_debug_report() timing
  PM / core: Remove unused initcall_debug_report() arguments
  PM / core: fix deferred probe breaking suspend resume order