summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/hptiop.c
diff options
context:
space:
mode:
authorLinus Torvalds2009-02-21 23:17:26 +0100
committerLinus Torvalds2009-02-21 23:17:26 +0100
commitadfafefd104d840ee4461965f22624d77532675b (patch)
tree6c6ba553a2b11703bf5952bd789905ea37c4fc4f /drivers/scsi/hptiop.c
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentPM: Fix suspend_console and resume_console to use only one semaphore (diff)
downloadkernel-qcow2-linux-adfafefd104d840ee4461965f22624d77532675b.tar.gz
kernel-qcow2-linux-adfafefd104d840ee4461965f22624d77532675b.tar.xz
kernel-qcow2-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 'drivers/scsi/hptiop.c')
0 files changed, 0 insertions, 0 deletions