Merge branch 'linus' into cpus4096

git-mirror · Dec 16, 2008 · 3c68b4a · 3c68b4a
2 parents 8299608 + 5279585
commit 3c68b4a
Show file tree

Hide file tree

Showing 17 changed files with 794 additions and 737 deletions.
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
@@ -48,7 +48,7 @@ config RUNTIME_DEBUG
 	help
 	  If you say Y here, some debugging macros will do run-time checking.
 	  If you say N here, those macros will mostly turn to no-ops.  See
-	  include/asm-mips/debug.h for debuging macros.
+	  arch/mips/include/asm/debug.h for debugging macros.
 	  If unsure, say N.
 
 endmenu