Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
index 85b714df8eae..948c547b8e9e 100644
--- a/drivers/lguest/lguest_user.c
+++ b/drivers/lguest/lguest_user.c
@@ -130,7 +130,7 @@ static int add_eventfd(struct lguest *lg, unsigned long addr, int fd)
         rcu_assign_pointer(lg->eventfds, new);
 
         /*
-         * We're not in a big hurry.  Wait until noone's looking at old
+         * We're not in a big hurry.  Wait until no one's looking at old
          * version, then free it.
          */
         synchronize_rcu();
@@ -514,6 +514,7 @@ static const struct file_operations lguest_fops = {
         .release = close,
         .write   = write,
         .read    = read,
+        .llseek  = default_llseek,
 };
 
 /*