commit | adfafefd104d840ee4461965f22624d77532675b | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 21 14:17:26 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 21 14:17:26 2009 -0800 |
tree | 6c6ba553a2b11703bf5952bd789905ea37c4fc4f | |
parent | 460c1338fc05add0e8050d4945a46f207b13a5fc [diff] | |
parent | 403f307576396f3362fbb65af190885b6036c72c [diff] |
Merge branch 'hibernate' * hibernate: PM: Fix suspend_console and resume_console to use only one semaphore PM: Wait for console in resume PM: Fix pm_notifiers during user mode hibernation swsusp: clean up shrink_all_zones() swsusp: dont fiddle with swappiness PM: fix build for CONFIG_PM unset PM/hibernate: fix "swap breaks after hibernation failures" PM/resume: wait for device probing to finish Consolidate driver_probe_done() loops into one place