tree 47c439bfdc9e5ea91f9a71235d336257555fad78
parent 20f4cad6b247160055915db4f4aaeda82e6c50ed
parent 6715045ddc7472a22be5e49d4047d2d89b391f45
author Linus Torvalds <torvalds@linux-foundation.org> 1284245453 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1284245453 -0700

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