summaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-21 14:17:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-21 14:17:26 -0800
commitadfafefd104d840ee4461965f22624d77532675b (patch)
tree6c6ba553a2b11703bf5952bd789905ea37c4fc4f /drivers/parport
parent460c1338fc05add0e8050d4945a46f207b13a5fc (diff)
parent403f307576396f3362fbb65af190885b6036c72c (diff)
downloadlinux-adfafefd104d840ee4461965f22624d77532675b.tar.bz2
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 'drivers/parport')
0 files changed, 0 insertions, 0 deletions