diff --git a/[refs] b/[refs]
index fd21a53aaeb9..39e3061f1d73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa33507a22623b3bd543b15a21c362cf364b6cff
+refs/heads/master: 1fa63a817d27af7dc0d5ed454eb8fe5dec65fac7
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 57e9cd7a9581..6f27c6a4bdc9 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -577,9 +577,6 @@ static int have_callable_console(void)
  * @fmt: format string
  *
  * This is printk().  It can be called from any context.  We want it to work.
- * Be aware of the fact that if oops_in_progress is not set, we might try to
- * wake klogd up which could deadlock on runqueue lock if printk() is called
- * from scheduler code.
  *
  * We try to grab the console_sem.  If we succeed, it's easy - we log the output and
  * call the console drivers.  If we fail to get the semaphore we place the output