diff --git a/[refs] b/[refs]
index bf7126283a97..4a71e170c190 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d3a9abe8ae055e1052295698bcd0722c92eff47
+refs/heads/master: 3eb1b3a40722cbb46631db373af66d13d1e7ac81
diff --git a/trunk/kernel/power/process.c b/trunk/kernel/power/process.c
index cba8a5890eda..1badb9a89ade 100644
--- a/trunk/kernel/power/process.c
+++ b/trunk/kernel/power/process.c
@@ -97,7 +97,9 @@ int freeze_processes(void)
 				continue;
 			if (frozen(p))
 				continue;
-			if (p->state == TASK_TRACED && frozen(p->parent)) {
+			if (p->state == TASK_TRACED &&
+			    (frozen(p->parent) ||
+			     p->parent->state == TASK_STOPPED)) {
 				cancel_freezing(p);
 				continue;
 			}