Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Apr 2010 02:44:42 +0000 (19:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Apr 2010 02:44:42 +0000 (19:44 -0700)
commit24b99d1576e6e330c2eba534a793b6e6dcb37f6b
treec8ad2d4ad7e06161d1b12013e91bf34d5eb9f556
parent6da8d866d0d39e9509ff826660f6a86a6757c966
parent5a7aadfe2fcb0f69e2acc1fbefe22a096e792fc9
Merge branch 'pm-fixes' of git://git./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