diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-21 23:17:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-21 23:17:26 +0100 |
| commit | adfafefd104d840ee4461965f22624d77532675b (patch) | |
| tree | 6c6ba553a2b11703bf5952bd789905ea37c4fc4f /arch/m68k/include/asm/atarihw.h | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | PM: Fix suspend_console and resume_console to use only one semaphore (diff) | |
| download | linux-adfafefd104d840ee4461965f22624d77532675b.tar.xz linux-adfafefd104d840ee4461965f22624d77532675b.zip | |
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
Diffstat (limited to 'arch/m68k/include/asm/atarihw.h')
0 files changed, 0 insertions, 0 deletions