tree 5f177f7571a56e7dfe3888f67fcc86532be8235c
parent f957db4fcdd8f03e186aa8f041f4049e76ab741c
parent a5f76d5eba157bf637beb2dd18026db2917c512e
author Linus Torvalds <torvalds@linux-foundation.org> 1308802132 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1308802132 -0700

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PCI / PM: Block races between runtime PM and system sleep
  PM / Domains: Update documentation
  PM / Runtime: Handle clocks correctly if CONFIG_PM_RUNTIME is unset
  PM: Fix async resume following suspend failure
  PM: Free memory bitmaps if opening /dev/snapshot fails
  PM: Rename dev_pm_info.in_suspend to is_prepared
  PM: Update documentation regarding sysdevs
  PM / Runtime: Update doc: usage count no longer incremented across system PM