• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 06a79b82
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM / Hibernate: Fix preallocating of memory
      PM / Hibernate: Remove swsusp.c finally
      PM / Hibernate: Remove trailing space in message
      PM: Allow SCSI devices to suspend/resume asynchronously
      PM: Allow USB devices to suspend/resume asynchronously
      USB: implement non-tree resume ordering constraints for PCI host controllers
      PM: Allow PCI devices to suspend/resume asynchronously
      PM / Hibernate: Swap, remove useless check from swsusp_read()
      PM / Hibernate: Really deprecate deprecated user ioctls
      PM: Allow device drivers to use dpm_wait()
      PM: Start asynchronous resume threads upfront
      PM: Add facility for advanced testing of async suspend/resume
      PM: Add a switch for disabling/enabling asynchronous suspend/resume
      PM: Asynchronous suspend and resume of devices
      PM: Add parent information to timing messages
      PM: Document device power attributes in sysfs
      PM / Runtime: Add sysfs switch for disabling device run-time PM
    06a79b82
scsi_sysfs.c 27.6 KB