| commit | 97740400bc76b64781d01f8cdfbcf750582006ef | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 16 15:02:30 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 16 15:02:30 2012 -0800 |
| tree | 85900329fbce72011339ab2348dcf13dde2a64fd | |
| parent | 408e057870c8680a50963b08f9f7efaa151a74ec [diff] | |
| parent | ee34a37049114303011e154478c63b977bcff24c [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