Merge branch 'sched/core' into cpus4096

Conflicts:
	include/linux/ftrace.h
	kernel/sched.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 972b2d2b8401..a1b3da6bad5c 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1134,7 +1134,7 @@ static int vpe_release(struct inode *inode, struct file *filp)
 
         /* It's good to be able to run the SP and if it chokes have a look at
            the /dev/rt?. But if we reset the pointer to the shared struct we
-           loose what has happened. So perhaps if garbage is sent to the vpe
+           lose what has happened. So perhaps if garbage is sent to the vpe
            device, use it as a trigger for the reset. Hopefully a nice
            executable will be along shortly. */
         if (ret < 0)