| commit | 84e1d836ef0759a152578a961894824bde89596f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 11 15:50:53 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 11 15:50:53 2010 -0700 |
| tree | 47c439bfdc9e5ea91f9a71235d336257555fad78 | |
| 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