From 2d31afd705fa83feeca8dc22a5601f69bb8dfdd5 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Sun, 9 Dec 2012 17:19:52 -0800
Subject: [PATCH] --- yaml --- r: 346865 b: refs/heads/master c:
 5155040ed349950e16c093ba8e65ad534994df2a h: refs/heads/master i:   346863:
 035e1d44085f5ff6a61c7b1773dc643ca502132a v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/user_namespace.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 85e149ae2d03..2f67117b08b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa6d054e5ce94720797ca260392a74dbced56412
+refs/heads/master: 5155040ed349950e16c093ba8e65ad534994df2a
diff --git a/trunk/kernel/user_namespace.c b/trunk/kernel/user_namespace.c
index f5975ccf9348..2b042c42fbc4 100644
--- a/trunk/kernel/user_namespace.c
+++ b/trunk/kernel/user_namespace.c
@@ -799,7 +799,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
 	if (user_ns == current_user_ns())
 		return -EINVAL;
 
-	/* Threaded many not enter a different user namespace */
+	/* Threaded processes may not enter a different user namespace */
 	if (atomic_read(&current->mm->mm_users) > 1)
 		return -EINVAL;