]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 408e057 ee34a37)
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Jan 2012 23:02:30 +0000 (15:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Jan 2012 23:02:30 +0000 (15:02 -0800)
commit97740400bc76b64781d01f8cdfbcf750582006ef
tree85900329fbce72011339ab2348dcf13dde2a64fdtree | snapshot
parent408e057870c8680a50963b08f9f7efaa151a74eccommit | diff
parentee34a37049114303011e154478c63b977bcff24ccommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.