From 30e4430505a97a27273f992e8257bd55b6c5975e Mon Sep 17 00:00:00 2001
From: Thomas Waldecker <thomas.waldecker@gmail.com>
Date: Thu, 27 Dec 2012 04:07:27 +0000
Subject: [PATCH] --- yaml --- r: 356383 b: refs/heads/master c:
 d69f1d7fa156ae2883bb3ba099046319cf00ccf6 h: refs/heads/master i:   356381:
 ede4316ec6bf1c4c1e469a2d21f86e0225949f87   356379:
 bcbfa318890da032b30301b334daefd4fb9ec677   356375:
 f51f33b9a3353195f3525c7c00fe918379977616   356367:
 61a9c37f5941bd08c7e2b4a9283f0b06005e00da   356351:
 0d2f364b8505d37b42a748d7b7f8a1712c859fdf v: v3

---
 [refs]                                       |  2 +-
 trunk/Documentation/powerpc/cpu_features.txt | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index cda481c315c8..20c2ab5bead8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf99de36e48678c61adb697496e0364c610bbbfc
+refs/heads/master: d69f1d7fa156ae2883bb3ba099046319cf00ccf6
diff --git a/trunk/Documentation/powerpc/cpu_features.txt b/trunk/Documentation/powerpc/cpu_features.txt
index ffa4183fdb8b..ae09df8722c8 100644
--- a/trunk/Documentation/powerpc/cpu_features.txt
+++ b/trunk/Documentation/powerpc/cpu_features.txt
@@ -11,10 +11,10 @@ split instruction and data caches, and if the CPU supports the DOZE and NAP
 sleep modes.
 
 Detection of the feature set is simple. A list of processors can be found in
-arch/ppc/kernel/cputable.c. The PVR register is masked and compared with each
-value in the list. If a match is found, the cpu_features of cur_cpu_spec is
-assigned to the feature bitmask for this processor and a __setup_cpu function
-is called.
+arch/powerpc/kernel/cputable.c. The PVR register is masked and compared with
+each value in the list. If a match is found, the cpu_features of cur_cpu_spec
+is assigned to the feature bitmask for this processor and a __setup_cpu
+function is called.
 
 C code may test 'cur_cpu_spec[smp_processor_id()]->cpu_features' for a
 particular feature bit. This is done in quite a few places, for example
@@ -51,6 +51,6 @@ should be used in the majority of cases.
 
 The END_FTR_SECTION macros are implemented by storing information about this
 code in the '__ftr_fixup' ELF section. When do_cpu_ftr_fixups
-(arch/ppc/kernel/misc.S) is invoked, it will iterate over the records in
+(arch/powerpc/kernel/misc.S) is invoked, it will iterate over the records in
 __ftr_fixup, and if the required feature is not present it will loop writing
 nop's from each BEGIN_FTR_SECTION to END_FTR_SECTION.