From 2bb8a6932bb746a729d4497a03eaa94ee27d3c59 Mon Sep 17 00:00:00 2001
From: Alessio Igor Bogani <abogani@texware.it>
Date: Tue, 16 Nov 2010 07:55:16 +0000
Subject: [PATCH] --- yaml --- r: 222195 b: refs/heads/master c:
 0f6b77ca12bea571e0a97b0588f62aa5f6012d61 h: refs/heads/master i:   222193:
 448c45831b9300f62a0c0b146b208a5a4f824f09   222191:
 126e8aa2137edd37ef8507827e3a97427de9396e v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/kernel/setup_64.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 66b6935af944..7062fceae366 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82ae5eaffad40a6d4738e8a57e48dd0d903a9ef0
+refs/heads/master: 0f6b77ca12bea571e0a97b0588f62aa5f6012d61
diff --git a/trunk/arch/powerpc/kernel/setup_64.c b/trunk/arch/powerpc/kernel/setup_64.c
index 2a178b0ebcdf..ce6f61c6f871 100644
--- a/trunk/arch/powerpc/kernel/setup_64.c
+++ b/trunk/arch/powerpc/kernel/setup_64.c
@@ -497,9 +497,8 @@ static void __init emergency_stack_init(void)
 }
 
 /*
- * Called into from start_kernel, after lock_kernel has been called.
- * Initializes bootmem, which is unsed to manage page allocation until
- * mem_init is called.
+ * Called into from start_kernel this initializes bootmem, which is used
+ * to manage page allocation until mem_init is called.
  */
 void __init setup_arch(char **cmdline_p)
 {