diff --git a/[refs] b/[refs]
index 5f84a74ed467..b5e33320c985 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b312e131cb88b83b6edc7a017b0249b4ea176edc
+refs/heads/master: e0a70217107e6f9844628120412cb27bb4cea194
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index b194febf5799..21aa7b3001fb 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -95,6 +95,14 @@ static void __exit_signal(struct task_struct *tsk)
 		tty = sig->tty;
 		sig->tty = NULL;
 	} else {
+		/*
+		 * This can only happen if the caller is de_thread().
+		 * FIXME: this is the temporary hack, we should teach
+		 * posix-cpu-timers to handle this case correctly.
+		 */
+		if (unlikely(has_group_leader_pid(tsk)))
+			posix_cpu_timers_exit_group(tsk);
+
 		/*
 		 * If there is any task waiting for the group exit
 		 * then notify it: