Merge branch 'master' into for-next

[karo-tx-linux.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 297d1a0eedb0e68d8b9327f530ba477c93b1222e..f89fb67818dee2dd2309de700125d2061b5095d5 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2640,7 +2640,7 @@ out:
  * try_to_wake_up_local - try to wake up a local task with rq lock held
  * @p: the thread to be awakened
  *
- * Put @p on the run-queue if it's not alredy there.  The caller must
+ * Put @p on the run-queue if it's not already there.  The caller must
  * ensure that this_rq() is locked, @p is bound to this_rq() and not
  * the current task.  this_rq() stays locked over invocation.
  */