]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 20f4cad 6715045)
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Sep 2010 22:50:53 +0000 (15:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Sep 2010 22:50:53 +0000 (15:50 -0700)
commit84e1d836ef0759a152578a961894824bde89596f
tree47c439bfdc9e5ea91f9a71235d336257555fad78tree | snapshot (tar.bz2 tar.gz zip)
parent20f4cad6b247160055915db4f4aaeda82e6c50edcommit | diff
parent6715045ddc7472a22be5e49d4047d2d89b391f45commit | 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
kernel/power/snapshot.c diff1 | diff2 | blob | history
Clone of davem's net-next-2.6 tree