tree c8ad2d4ad7e06161d1b12013e91bf34d5eb9f556
parent 6da8d866d0d39e9509ff826660f6a86a6757c966
parent 5a7aadfe2fcb0f69e2acc1fbefe22a096e792fc9
author Linus Torvalds <torvalds@linux-foundation.org> 1270262682 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1270262682 -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:
  Freezer: Fix buggy resume test for tasks frozen with cgroup freezer
  Freezer: Only show the state of tasks refusing to freeze