diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 15:50:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 15:50:53 -0700 |
| commit | 84e1d836ef0759a152578a961894824bde89596f (patch) | |
| tree | 47c439bfdc9e5ea91f9a71235d336257555fad78 /drivers/scsi/constants.c | |
| parent | 20f4cad6b247160055915db4f4aaeda82e6c50ed (diff) | |
| parent | 6715045ddc7472a22be5e49d4047d2d89b391f45 (diff) | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Hibernate: Avoid hitting OOM during preallocation of memory
PM QoS: Correct pr_debug() misuse and improve parameter checks
PM: Prevent waiting forever on asynchronous resume after failing suspend
Diffstat (limited to 'drivers/scsi/constants.c')
0 files changed, 0 insertions, 0 deletions