From: Linus Torvalds Date: Sat, 3 Apr 2010 02:44:42 +0000 (-0700) Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe... X-Git-Tag: v2.6.34-rc4~84 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=24b99d1576e6e330c2eba534a793b6e6dcb37f6b;p=linux.git 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 --- 24b99d1576e6e330c2eba534a793b6e6dcb37f6b