From: Linus Torvalds Date: Sat, 21 Feb 2009 22:17:26 +0000 (-0800) Subject: Merge branch 'hibernate' X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=adfafefd104d840ee4461965f22624d77532675b;p=linux-2.6-omap-h63xx.git 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 --- adfafefd104d840ee4461965f22624d77532675b