• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · c8940eca
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      spi / PM: Support dev_pm_ops
      PM: Prototype the pm_generic_ operations
      PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally
      PM: Use dev_name() in core device suspend and resume routines
      PM: Permit registration of parentless devices during system suspend
      PM: Replace the device power.status field with a bit field
      PM: Remove redundant checks from core device resume routines
      PM: Use a different list of devices for each stage of device suspend
      PM: Avoid compiler warning in pm_noirq_op()
      PM: Use pm_wakeup_pending() in __device_suspend()
      PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()
      PM: Prevent dpm_prepare() from returning errors unnecessarily
      PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt
      PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3)
      PM / Hibernate: When failed, in_suspend should be reset
      PM / Hibernate: hibernation_ops->leave should be checked too
      Freezer: Fix a race during freezing of TASK_STOPPED tasks
      PM: Use proper ccflag flag in kernel/power/Makefile
      PM / Runtime: Fix comments to match runtime callback code
    c8940eca
suspend.c 6.81 KB