diff --git a/[refs] b/[refs]
index 373edfe135f8..12789067e758 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42d4dc3f4e1ec1396371aac89d0dccfdd977191b
+refs/heads/master: c06fec5022ebe014af876da2df4a0eee836e97c8
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index 39d35935b371..93851bcd9584 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -517,8 +517,6 @@ static inline void choose_new_parent(task_t *p, task_t *reaper, task_t *child_re
 	 */
 	BUG_ON(p == reaper || reaper->exit_state >= EXIT_ZOMBIE);
 	p->real_parent = reaper;
-	if (p->parent == p->real_parent)
-		BUG();
 }
 
 static inline void reparent_thread(task_t *p, task_t *father, int traced)