From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Jan 2012 23:02:30 +0000 (-0800)
Subject: Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=97740400bc76b64781d01f8cdfbcf750582006ef;p=~shefty%2Frdma-dev.git

Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Hibernate: Drop the check of swap space size for compressed image
  PM / shmobile: fix A3SP suspend method
  PM / Domains: Skip governor functions for CONFIG_PM_RUNTIME unset
  PM / Domains: Fix build for CONFIG_PM_SLEEP unset
  PM: Make sysrq-o be available for CONFIG_PM unset
---

97740400bc76b64781d01f8cdfbcf750582006ef